Remoção da parada de VMs após falha na migração devido ao _host_ preparando para manutenção

Author: gp-santos

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -3546,38 +3546,26 @@ private void orchestrateMigrateAway(final String vmUuid, final long srcHostId, f
         DataCenterDeployment plan = getMigrationDeployment(vm, host, poolId, excludes);
 
         DeployDestination dest = null;
-        while (true) {
-
-            try {
-                plan.setMigrationPlan(true);
-                dest = _dpMgr.planDeployment(profile, plan, excludes, planner);
-            } catch (final AffinityConflictException e2) {
-                String message = String.format("Unable to create deployment, affinity rules associated to the %s conflict.", vm.toString());
-                logger.warn(message, e2);
-                throw new CloudRuntimeException(message, e2);
-            }
-            if (dest == null) {
-                logger.warn("Unable to find destination for migrating the vm {}", profile);
-                throw new InsufficientServerCapacityException("Unable to find a server to migrate to.", DataCenter.class, host.getDataCenterId());
-            }
-            logger.debug("Found destination {} for migrating to.", dest);
-
-            excludes.addHost(dest.getHost().getId());
-            try {
-                migrate(vm, srcHostId, dest);
-                return;
-            } catch (ResourceUnavailableException | ConcurrentOperationException e) {
-                logger.warn("Unable to migrate {} to {} due to [{}]", vm.toString(), dest.getHost().toString(), e.getMessage(), e);
-            }
+        try {
+            plan.setMigrationPlan(true);
+            dest = _dpMgr.planDeployment(profile, plan, excludes, planner);
+        } catch (final AffinityConflictException e2) {
+            String message = String.format("Unable to create deployment, affinity rules associated to the %s conflict.", vm.toString());
+            logger.warn(message, e2);
+            throw new CloudRuntimeException(message, e2);
+        }
+        if (dest == null) {
+            logger.warn("Unable to find destination for migrating the vm {}", profile);
+            throw new InsufficientServerCapacityException("Unable to find a server to migrate to.", DataCenter.class, host.getDataCenterId());
+        }
+        logger.debug("Found destination {} for migrating to.", dest);
 
-            try {
-                advanceStop(vmUuid, true);
-                throw new CloudRuntimeException("Unable to migrate " + vm);
-            } catch (final ResourceUnavailableException | ConcurrentOperationException | OperationTimedoutException e) {
-                logger.error("Unable to stop {} due to [{}].", vm.toString(), e.getMessage(), e);
-                throw new CloudRuntimeException("Unable to migrate " + vm);
-            }
+        try {
+            migrate(vm, srcHostId, dest);
+        } catch (ResourceUnavailableException | ConcurrentOperationException e) {
+            logger.warn("Unable to migrate {} to {} due to [{}]", vm.toString(), dest.getHost().toString(), e.getMessage(), e);
         }
+
     }
 
     /**