apache · nvazquez · Aug 26, 2021 · Jul 29, 2021 · Aug 16, 2021 · Aug 16, 2021
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
@@ -271,6 +271,9 @@ iscsi.session.cleanup.enabled=false
 # Depending on the use case, this timeout might need increasing/decreasing.
 # heartbeat.update.timeout=60000

+# This parameter specifies the timeout in seconds to retrieve the target's domain id when migrating a VM with KVM.
+# vm.migrate.domain.retrieve.timeout=10
+
 # This parameter specifies if the host must be rebooted when something goes wrong with the heartbeat.
 # reboot.host.and.alert.management.on.heartbeat.timeout=true


diff --git a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
@@ -29,9 +29,16 @@ public class AgentProperties{
     * Heartbeat update timeout. <br>
     * Data type: int. <br>
     * Default value: 60000 (ms).
-    */
+     */
    public static final Property<Integer> HEARTBEAT_UPDATE_TIMEOUT = new Property<Integer>("heartbeat.update.timeout", 60000);

+    /**
+     * The timeout in seconds to retrieve the target's domain id when migrating a VM with KVM. <br>
+     * Data type: int. <br>
+     * Default value: 10 (sec).
+     */
+    public static final Property<Integer> VM_MIGRATE_DOMAIN_RETRIEVE_TIMEOUT = new Property<Integer>("vm.migrate.domain.retrieve.timeout", 10);
+
    /**
     * Reboot host and alert management on heartbeat timeout. <br>
     * Data type: boolean.<br>

diff --git a/...src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java b/...src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java
@@ -66,6 +66,8 @@
 import com.cloud.agent.api.MigrateCommand;
 import com.cloud.agent.api.MigrateCommand.MigrateDiskInfo;
 import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.agent.properties.AgentProperties;
+import com.cloud.agent.properties.AgentPropertiesFileHandler;
 import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
 import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
@@ -239,7 +241,7 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
            }
            s_logger.info("Migration thread for " + vmName + " is done");

-            destDomain = migrateThread.get(10, TimeUnit.SECONDS);
+            destDomain = migrateThread.get(AgentPropertiesFileHandler.getPropertyValue(AgentProperties.VM_MIGRATE_DOMAIN_RETRIEVE_TIMEOUT), TimeUnit.SECONDS);

            if (destDomain != null) {
                deleteOrDisconnectDisksOnSourcePool(libvirtComputingResource, migrateDiskInfoList, disks);