Fix: Condition for aborting migration, resume paused VMs on destination

Author: nvazquez

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java

@@ -246,7 +246,7 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
             while (!executor.isTerminated()) {
                 Thread.sleep(100);
                 sleeptime += 100;
-                if (sleeptime == 1000) { // wait 1s before attempting to set downtime on migration, since I don't know of a VIR_DOMAIN_MIGRATING state
+                if (sleeptime >= 1000) { // wait 1s before attempting to set downtime on migration, since I don't know of a VIR_DOMAIN_MIGRATING state
                     final int migrateDowntime = libvirtComputingResource.getMigrateDowntime();
                     if (migrateDowntime > 0 ) {
                         try {
@@ -272,7 +272,7 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
                     } catch (final LibvirtException e) {
                         logger.info("Couldn't get VM domain state after " + sleeptime + "ms: " + e.getMessage());
                     }
-                    if (state != null && state == DomainState.VIR_DOMAIN_RUNNING) {
+                    if (state != null && (state == DomainState.VIR_DOMAIN_RUNNING || state == DomainState.VIR_DOMAIN_PAUSED)) {
                         try {
                             DomainJobInfo job = dm.getJobInfo();
                             logger.info(String.format("Aborting migration of VM [%s] with domain job [%s] due to time out after %d seconds.", vmName, job, migrateWait));
@@ -314,6 +314,21 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
                 if (logger.isDebugEnabled()) {
                     logger.debug(String.format("Cleaning the disks of VM [%s] in the source pool after VM migration finished.", vmName));
                 }
+                DomainState dmState = null;
+                try {
+                    dmState = destDomain.getInfo().state;
+                } catch (final LibvirtException e) {
+                    logger.info("Failed to get domain state for VM: " + vmName + " due to: " + e.getMessage());
+                }
+
+                if (dmState == DomainState.VIR_DOMAIN_PAUSED) {
+                    logger.info("Resuming VM " + vmName + " on destination after migration");
+                    try {
+                        destDomain.resume();
+                    } catch (final Exception e) {
+                        logger.error("Failed to resume vm " + vmName + " on destination after migration due to : " + e.getMessage());
+                    }
+                }
                 deleteOrDisconnectDisksOnSourcePool(libvirtComputingResource, migrateDiskInfoList, disks);
                 libvirtComputingResource.cleanOldSecretsByDiskDef(conn, disks);
             }