live migration: add custom config timeout for MigrateWithStorageCommand (#22)

marcaurele · marcaurele · commit 4ff1562a51a5 · 2016-10-18T07:39:58.000+02:00
diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/storage/motion/KVMStorageMotionStrategy.java b/plugins/hypervisors/kvm/src/org/apache/cloudstack/storage/motion/KVMStorageMotionStrategy.java
@@ -59,6 +59,7 @@
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
+import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.storage.command.DeleteCommand;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
@@ -73,6 +74,9 @@
 @Component
 public class KVMStorageMotionStrategy  implements DataMotionStrategy {
     private static final Logger s_logger = Logger.getLogger(KVMStorageMotionStrategy.class);
+
+    protected final ConfigKey<Integer> MigrateWait = new ConfigKey<Integer>(Integer.class, "migratewait", "Advanced", "3600", "Time (in seconds) to wait for VM migrate finish.", true, ConfigKey.Scope.Global, null);
+
     @Inject
     AgentManager agentMgr;
     @Inject
@@ -193,6 +197,7 @@ private Answer migrateVmWithVolumes(VMInstanceVO vm, VirtualMachineTO to, Host s
         MigrateWithStorageCommand command = null;
         try {
             command = new MigrateWithStorageCommand(to, volumeToFilerTo, destHost.getPrivateIpAddress());
+            command.setWait(MigrateWait.value());
             MigrateWithStorageAnswer answer = (MigrateWithStorageAnswer) agentMgr.send(srcHost.getId(), command);
             if (answer == null) {
                 s_logger.error("Migration with storage of vm " + vm + " failed.");
