Add tests to Service Job Controllers

apache · JoaoJandre · May 30, 2025 · Mar 6, 2026 · Mar 9, 2026 · Mar 10, 2026
commit 4db575c10dd9ffc761341e59c06bd76efc587064
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupCompressionServiceJobController.java b/server/src/main/java/org/apache/cloudstack/backup/BackupCompressionServiceJobController.java
@@ -105,7 +105,7 @@ protected void searchAndDispatchJobs() {
             }
 
             for (DataCenterVO zone : zones) {
-                if (!BackupManager.BackupFrameworkEnabled.valueIn(zone.getId())) {
+                if (!isFrameworkEnabledForZone(zone)) {
                     logger.debug("Backup framework is not enabled for zone [{}], will not run the backup compression task for this zone.", zone.getUuid());
                     continue;
                 }
@@ -156,7 +156,7 @@ protected void submitQueuedJob(InternalBackupServiceJobVO job, long zoneId, Stri
     /**
      * Submit FinalizeCompression jobs, this should be called before submitStartJobsForExecution.
      * */
-    private HashSet<Long> submitFinalizeJobsForExecution(List<InternalBackupServiceJobVO> jobsToExecute, List<Pair<HostVO, Long>> hostAndNumberOfJobsPairList, long zoneId) {
+    protected HashSet<Long> submitFinalizeJobsForExecution(List<InternalBackupServiceJobVO> jobsToExecute, List<Pair<HostVO, Long>> hostAndNumberOfJobsPairList, long zoneId) {
         List<InternalBackupServiceJobVO> submittedJobs = new ArrayList<>();
         HashSet<Long> setOfInstancesWithExecutingCompressionJobs = new HashSet<>();
         for (InternalBackupServiceJobVO job : jobsToExecute) {
@@ -207,7 +207,7 @@ private void finalizeBackupCompression(InternalBackupServiceJobVO job, long zone
         }
     }
 
-    private List<InternalBackupServiceJobVO> filterJobsOfDomainsAndAccountsWithDisabledCompressionTask(List<InternalBackupServiceJobVO> jobsToFilter) {
+    protected List<InternalBackupServiceJobVO> filterJobsOfDomainsAndAccountsWithDisabledCompressionTask(List<InternalBackupServiceJobVO> jobsToFilter) {
         ArrayList<InternalBackupServiceJobVO> filteredJobs = new ArrayList<>();
         for (InternalBackupServiceJobVO job : jobsToFilter) {
             if (backupCompressionTaskEnabled.valueIn(job.getAccountId())) {

diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupValidationServiceController.java b/server/src/main/java/org/apache/cloudstack/backup/BackupValidationServiceController.java
@@ -113,7 +113,7 @@ protected void searchAndDispatchJobs() {
             }
 
             for (DataCenterVO zone : zones) {
-                if (!BackupManager.BackupFrameworkEnabled.valueIn(zone.getId())) {
+                if (!isFrameworkEnabledForZone(zone)) {
                     logger.debug("Backup framework is not enabled for zone [{}], will not run the backup validation task for this zone.", zone.getUuid());
                     continue;
                 }
@@ -179,7 +179,7 @@ private void startBackupValidation(InternalBackupServiceJobVO job, long zoneId,
         }
     }
 
-    private List<InternalBackupServiceJobVO> filterJobsOfDomainsAndAccountsWithDisabledValidationTask(List<InternalBackupServiceJobVO> jobsToFilter) {
+    protected List<InternalBackupServiceJobVO> filterJobsOfDomainsAndAccountsWithDisabledValidationTask(List<InternalBackupServiceJobVO> jobsToFilter) {
         ArrayList<InternalBackupServiceJobVO> filteredJobs = new ArrayList<>();
         for (InternalBackupServiceJobVO job : jobsToFilter) {
             if (backupValidationTaskEnabled.valueIn(job.getAccountId())) {

diff --git a/server/src/main/java/org/apache/cloudstack/backup/InternalBackupServiceJobController.java b/server/src/main/java/org/apache/cloudstack/backup/InternalBackupServiceJobController.java
@@ -224,7 +224,7 @@ protected List<Pair<HostVO, Long>> filterHostsWithTooManyJobs(HashMap<HostVO, Lo
         return hostAndNumberOfJobsPairList;
     }
 
-    private Integer getMaxConcurrentCompressionsPerHost(ConfigKey<Integer> jobsPerHostConfiguration, HostVO host) {
+    protected Integer getMaxConcurrentCompressionsPerHost(ConfigKey<Integer> jobsPerHostConfiguration, HostVO host) {
         if (host.getDetail(jobsPerHostConfiguration.key()) != null) {
             return Integer.valueOf(host.getDetail(jobsPerHostConfiguration.key()));
         } else {
@@ -271,6 +271,11 @@ protected void submitQueuedJobsForExecution(List<InternalBackupServiceJobVO> job
         }
     }
 
+
+    protected Boolean isFrameworkEnabledForZone(DataCenterVO zone) {
+        return BackupManager.BackupFrameworkEnabled.valueIn(zone.getId());
+    }
+
     protected void submitQueuedJob(InternalBackupServiceJobVO job, long zoneId, String logId) {
     }