read usage server settings from the DB, not ConfigKey.value()

The usage server has no ConfigDepot, so ConfigKey.value() only returns the
built-in defaults there. Also drop an unused import.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: DaanHoogland

framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java

@@ -125,7 +125,8 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
             mergeConfigs(configs, params);
         }
 
-        String usageAggregationTimeZoneStr = ObjectUtils.defaultIfNull(UsageService.UsageAggregationTimezone.value(), "GMT");
+        // also runs in the usage server, which has no ConfigDepot: read the value from the DB map
+        String usageAggregationTimeZoneStr = ObjectUtils.defaultIfNull(configs.get(UsageService.UsageAggregationTimezone.key()), "GMT");
         usageAggregationTimeZone = TimeZone.getTimeZone(usageAggregationTimeZoneStr);
 
         return true;

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -277,7 +277,6 @@
 import com.cloud.projects.Project;
 import com.cloud.projects.ProjectManager;
 import com.cloud.resourcelimit.CheckedReservation;
-import com.cloud.server.ManagementServer;
 import com.cloud.server.ManagementService;
 import com.cloud.service.ServiceOfferingDetailsVO;
 import com.cloud.service.ServiceOfferingVO;

usage/src/main/java/com/cloud/usage/UsageManagerImpl.java

@@ -42,6 +42,7 @@
 import javax.naming.ConfigurationException;
 import javax.persistence.EntityExistsException;
 
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.quota.QuotaAlertManager;
 import org.apache.cloudstack.quota.QuotaManager;
@@ -92,6 +93,7 @@
 import com.cloud.utils.db.QueryBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.TransactionLegacy;
+import com.cloud.utils.exception.CloudRuntimeException;
 
 @Component
 public class UsageManagerImpl extends ManagerBase implements UsageManager, Runnable {
@@ -143,6 +145,8 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
     @Inject
     protected UsageEventDetailsDao _usageEventDetailsDao;
     @Inject
+    ConfigurationDao _configDao;
+    @Inject
     private UsageVMSnapshotDao _usageVMSnapshotDao;
     @Inject
     private UsageVMSnapshotOnPrimaryDao _usageSnapshotOnPrimaryDao;
@@ -192,6 +196,12 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
     public UsageManagerImpl() {
     }
 
+    private void mergeConfigs(Map<String, String> dbParams, Map<String, Object> xmlParams) {
+        for (Map.Entry<String, Object> param : xmlParams.entrySet()) {
+            dbParams.put(param.getKey(), (String)param.getValue());
+        }
+    }
+
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
         final String run = "usage.vmops.pid";
@@ -208,15 +218,30 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
             logger.info("Implementation Version is " + _version);
         }
 
-        String execTime = UsageService.UsageStatsJobExecTime.value();
-        Integer aggregationRange = UsageService.UsageStatsJobAggregationRange.value();
-        String execTimeZone = UsageService.UsageExecutionTimezone.value();
-        String aggregationTimeZone = UsageService.UsageAggregationTimezone.value();
-        Integer sanityCheckInterval = UsageService.UsageSanityCheckInterval.value();
-        _runQuota = QuotaConfig.QuotaPluginEnabled.value();
-        usageSnapshotSelection = UsageService.UsageSnapshotVirtualSizeSelect.value();
+        // the usage server has no ConfigDepot, so ConfigKey.value() would only return the defaults here
+        Map<String, String> configs;
+        try {
+            configs = _configDao.getConfiguration(params);
+
+            if (params != null) {
+                mergeConfigs(configs, params);
+                logger.info("configs = " + configs);
+            }
+        } catch (CloudRuntimeException e) {
+            logger.error("Unhandled configuration exception: " + e.getMessage());
+            throw new CloudRuntimeException("Unhandled configuration exception", e);
+        }
+
+        String execTime = configs.get(UsageService.UsageStatsJobExecTime.key());
+        String aggregationRange = configs.get(UsageService.UsageStatsJobAggregationRange.key());
+        String execTimeZone = configs.get(UsageService.UsageExecutionTimezone.key());
+        String aggregationTimeZone = configs.get(UsageService.UsageAggregationTimezone.key());
+        String sanityCheckInterval = configs.get(UsageService.UsageSanityCheckInterval.key());
+        String quotaEnable = configs.get(QuotaConfig.QuotaPluginEnabled.key());
+        _runQuota = Boolean.valueOf(quotaEnable == null ? "false" : quotaEnable );
+        usageSnapshotSelection  = Boolean.valueOf(configs.get(UsageService.UsageSnapshotVirtualSizeSelect.key()));
         if (sanityCheckInterval != null) {
-            _sanityCheckInterval = sanityCheckInterval;
+            _sanityCheckInterval = Integer.parseInt(sanityCheckInterval);
         }
 
         if (aggregationTimeZone != null && !aggregationTimeZone.isEmpty()) {
@@ -246,7 +271,7 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
                     usageExecutionTimeZone.getID(), execTime, aggregationRange, DateUtil.displayDateInTimezone(usageExecutionTimeZone, new Date()),
                     DateUtil.displayDateInTimezone(usageExecutionTimeZone, _jobExecTime.getTime()), usageAggregationTimeZone.getID());
 
-            _aggregationDuration = aggregationRange;
+            _aggregationDuration = Integer.parseInt(aggregationRange);
             if (_aggregationDuration < UsageUtils.USAGE_AGGREGATION_RANGE_MIN) {
                 logger.warn("Usage stats job aggregation range is to small, using the minimum value of " + UsageUtils.USAGE_AGGREGATION_RANGE_MIN);
                 _aggregationDuration = UsageUtils.USAGE_AGGREGATION_RANGE_MIN;