KvmAutoConvergence configkey backported from master (#12)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: rohityadavcloud

engine/components-api/src/com/cloud/storage/StorageManager.java

@@ -58,7 +58,14 @@ public interface StorageManager extends StorageService {
             true,
             ConfigKey.Scope.Global,
             null);
-
+    ConfigKey<Boolean> KvmAutoConvergence = new ConfigKey<>(Boolean.class,
+            "kvm.auto.convergence",
+            "Storage",
+            "false",
+            "Setting this to 'true' allows KVM to use auto convergence to complete VM migration (libvirt version 1.2.3+ and QEMU version 1.6+)",
+            true,
+            ConfigKey.Scope.Global,
+            null);
     /**
      * Returns a comma separated list of tags for the specified storage pool
      * @param poolId

engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java

@@ -1138,11 +1138,7 @@ public void copyAsync(Map<VolumeInfo, DataStore> volumeDataStoreMap, VirtualMach
             migrateCommand.setWait(StorageManager.KvmStorageOnlineMigrationWait.value());
             migrateCommand.setMigrateStorage(migrateStorage);
             migrateCommand.setMigrateStorageManaged(managedStorageDestination);
-
-            String autoConvergence = _configDao.getValue(Config.KvmAutoConvergence.toString());
-            boolean kvmAutoConvergence = Boolean.parseBoolean(autoConvergence);
-
-            migrateCommand.setAutoConvergence(kvmAutoConvergence);
+            migrateCommand.setAutoConvergence(StorageManager.KvmAutoConvergence.value());
 
             MigrateAnswer migrateAnswer = (MigrateAnswer)_agentMgr.send(srcHost.getId(), migrateCommand);
 

server/src/com/cloud/configuration/Config.java

@@ -914,14 +914,6 @@ public enum Config {
             "0",
             "Default disk I/O writerate in bytes per second allowed in User vm's disk.",
             null),
-    KvmAutoConvergence(
-            "Advanced",
-            ManagementServer.class,
-            Boolean.class,
-            "kvm.auto.convergence",
-            "false",
-            "Setting this to 'true' allows KVM to use auto convergence to complete VM migration (libvirt version 1.2.3+ and QEMU version 1.6+)",
-            null),
     ControlCidr(
             "Advanced",
             ManagementServer.class,

server/src/com/cloud/storage/StorageManagerImpl.java

@@ -2390,7 +2390,7 @@ public String getConfigComponentName() {
     @Override
     public ConfigKey<?>[] getConfigKeys() {
         return new ConfigKey<?>[] {StorageCleanupInterval, StorageCleanupDelay, StorageCleanupEnabled,
-                KvmStorageOnlineMigrationWait};
+                KvmStorageOnlineMigrationWait, KvmAutoConvergence};
     }
 
     @Override