Revert "Update backup.framework.enabled config to Global scope"

This reverts commit b0b037f.

Author: sureshanaparti

api/src/main/java/org/apache/cloudstack/backup/BackupManager.java

@@ -40,7 +40,7 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
     ConfigKey<Boolean> BackupFrameworkEnabled = new ConfigKey<>("Advanced", Boolean.class,
             "backup.framework.enabled",
             "false",
-            "Is backup and recovery framework enabled.", false);
+            "Is backup and recovery framework enabled.", false, ConfigKey.Scope.Zone);
 
     ConfigKey<String> BackupProviderPlugin = new ConfigKey<>("Advanced", String.class,
             "backup.framework.provider.plugin",

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -946,13 +946,13 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
         return true;
     }
 
-    public boolean isDisabled() {
-        return !(BackupFrameworkEnabled.value());
+    public boolean isDisabled(final Long zoneId) {
+        return !(BackupFrameworkEnabled.valueIn(zoneId));
     }
 
     private void validateForZone(final Long zoneId) {
-        if (zoneId == null || isDisabled()) {
-            throw new CloudRuntimeException("Backup and Recovery feature is disabled");
+        if (zoneId == null || isDisabled(zoneId)) {
+            throw new CloudRuntimeException("Backup and Recovery feature is disabled for the zone");
         }
     }
 
@@ -1127,7 +1127,7 @@ public void scheduleBackups() {
                 continue;
             }
 
-            if (isDisabled()) {
+            if (isDisabled(vm.getDataCenterId())) {
                 continue;
             }
 
@@ -1236,11 +1236,12 @@ protected void runInContext() {
                 if (logger.isTraceEnabled()) {
                     logger.trace("Backup sync background task is running...");
                 }
-                if (isDisabled()) {
-                    logger.debug("Backup Sync Task is not enabled. Skipping!");
-                    return;
-                }
                 for (final DataCenter dataCenter : dataCenterDao.listAllZones()) {
+                    if (dataCenter == null || isDisabled(dataCenter.getId())) {
+                        logger.debug("Backup Sync Task is not enabled in zone [{}]. Skipping this zone!", dataCenter == null ? "NULL Zone!" : dataCenter);
+                        continue;
+                    }
+
                     final BackupProvider backupProvider = getBackupProvider(dataCenter.getId());
                     if (backupProvider == null) {
                         logger.warn("Backup provider not available or configured for zone {}", dataCenter);