Validação de último _host_ de VM em manutenção

Author: gp-santos

server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java

@@ -37,6 +37,7 @@
 
 import com.cloud.api.ApiDBUtils;
 import com.cloud.cpu.CPU;
+import com.cloud.resource.ResourceState;
 import com.cloud.vm.UserVmManager;
 import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO;
 import com.cloud.storage.VMTemplateVO;
@@ -487,11 +488,6 @@ private DeployDestination deployInVmLastHost(VirtualMachineProfile vmProfile, De
         if (canUseLastHost(host, avoids, plan, vm, offering, volumesRequireEncryption)) {
             _hostDao.loadHostTags(host);
             _hostDao.loadDetails(host);
-            if (host.getStatus() != Status.Up) {
-                logger.debug("Cannot deploy VM [{}] to the last host [{}] because this host is not in UP state or is not enabled. Host current status [{}] and resource status [{}].",
-                        vm.getUuid(), host.getUuid(), host.getState().name(), host.getResourceState());
-                return null;
-            }
             if (checkVmProfileAndHost(vmProfile, host)) {
                 long cluster_id = host.getClusterId();
                 ClusterDetailsVO cluster_detail_cpu = _clusterDetailsDao.findDetail(cluster_id, "cpuOvercommitRatio");
@@ -573,6 +569,16 @@ private boolean canUseLastHost(HostVO host, ExcludeList avoids, DeploymentPlan p
             return false;
         }
 
+        if (host.getStatus() != Status.Up) {
+            logger.debug("Cannot deploy VM [{}] to the last host [{}] because this host is not Up: [{}].", vm.getUuid(), host.getUuid(), host.getState().name());
+            return false;
+        }
+
+        if (host.getResourceState() != ResourceState.Enabled) {
+            logger.debug("Cannot deploy VM [{}] to the last host [{}] because this host is not Enabled: [{}].", vm.getUuid(), host.getUuid(), host.getResourceState());
+            return false;
+        }
+
         if (avoids.shouldAvoid(host)) {
             logger.warn("The last host [{}] of VM [{}] is in the avoid set. Skipping this and trying other available hosts.", host.getUuid(), vm.getUuid());
             return false;