From 9071c47f5b99fdb75701920bbc4c040f012be841 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Thu, 13 Nov 2025 14:35:39 +0530 Subject: [PATCH 1/4] Deployment plan fixes for VM with last host - Consider last host when it is not in maintenance - Fail deployment when user requests for last host consideration and last host doesn't exists or in maintenance --- .../deploy/DeploymentPlanningManagerImpl.java | 25 ++++++++++++++----- .../cloud/ha/HighAvailabilityManagerImpl.java | 4 +-- .../cloud/resource/ResourceManagerImpl.java | 2 +- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java index e7b926eb4e44..a8942678b19c 100644 --- a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java +++ b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java @@ -384,13 +384,26 @@ public DeployDestination planDeployment(VirtualMachineProfile vmProfile, Deploym boolean considerLastHost = vm.getLastHostId() != null && haVmTag == null && (considerLastHostStr == null || Boolean.TRUE.toString().equalsIgnoreCase(considerLastHostStr)); if (considerLastHost) { + logger.debug("This VM has last host_id: {}", vm.getLastHostId()); HostVO host = _hostDao.findById(vm.getLastHostId()); - logger.debug("This VM has last host_id specified, trying to choose the same host: " + host); - lastHost = host; + if (host == null) { + if (Boolean.TRUE.toString().equalsIgnoreCase(considerLastHostStr)) { + throw new CloudRuntimeException("Failed to deploy VM, last host doesn't exists"); + } + } else { + if (host.isInMaintenanceStates()) { + if (Boolean.TRUE.toString().equalsIgnoreCase(considerLastHostStr)) { + throw new CloudRuntimeException("Failed to deploy VM, last host is in maintenance state"); + } + } else { + logger.debug("VM's last {}, trying to choose the same host", host); + lastHost = host; - DeployDestination deployDestination = deployInVmLastHost(vmProfile, plan, avoids, planner, vm, dc, offering, cpuRequested, ramRequested, volumesRequireEncryption); - if (deployDestination != null) { - return deployDestination; + DeployDestination deployDestination = deployInVmLastHost(vmProfile, plan, avoids, planner, vm, dc, offering, cpuRequested, ramRequested, volumesRequireEncryption); + if (deployDestination != null) { + return deployDestination; + } + } } } @@ -1474,7 +1487,7 @@ private Pair findVMStorageRequirements(VirtualMachineProfile v protected Pair> findPotentialDeploymentResources(List suitableHosts, Map> suitableVolumeStoragePools, ExcludeList avoid, PlannerResourceUsage resourceUsageRequired, List readyAndReusedVolumes, List preferredHosts, VirtualMachine vm) { - logger.debug("Trying to find a potenial host and associated storage pools from the suitable host/pool lists for this VM"); + logger.debug("Trying to find a potential host and associated storage pools from the suitable host/pool lists for this VM"); boolean hostCanAccessPool = false; boolean haveEnoughSpace = false; diff --git a/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java index 7e0c0a2a5ffa..3b02ab196d70 100644 --- a/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java +++ b/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java @@ -833,7 +833,7 @@ public Long migrate(final HaWorkVO work) { if (checkAndCancelWorkIfNeeded(work)) { return null; } - logger.info("Migration attempt: for VM {}from host {}. Starting attempt: {}/{} times.", vm, srcHost, 1 + work.getTimesTried(), _maxRetries); + logger.info("Migration attempt: for {} from {}. Starting attempt: {}/{} times.", vm, srcHost, 1 + work.getTimesTried(), _maxRetries); if (VirtualMachine.State.Stopped.equals(vm.getState())) { logger.info(String.format("vm %s is Stopped, skipping migrate.", vm)); @@ -843,7 +843,7 @@ public Long migrate(final HaWorkVO work) { logger.info(String.format("VM %s is running on a different host %s, skipping migration", vm, vm.getHostId())); return null; } - logger.info("Migration attempt: for VM " + vm.getUuid() + "from host id " + srcHostId + + logger.info("Migration attempt: for VM " + vm.getUuid() + " from host id " + srcHostId + ". Starting attempt: " + (1 + work.getTimesTried()) + "/" + _maxRetries + " times."); try { diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java index 24f895484908..10ae0f34cd0b 100755 --- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java @@ -1417,7 +1417,7 @@ private boolean doMaintain(final long hostId) { throw new CloudRuntimeException("There are active VMs using the host's local storage pool. Please stop all VMs on this host that use local storage."); } } else { - logger.info("Maintenance: scheduling migration of VM {} from host {}", vm, host); + logger.info("Maintenance: scheduling migration of {} from {}", vm, host); _haMgr.scheduleMigration(vm, HighAvailabilityManager.ReasonType.HostMaintenance); } } From 6aa828b8063ea63e89b3df222733bde93c0a68e4 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Thu, 13 Nov 2025 15:21:26 +0530 Subject: [PATCH 2/4] changes --- .../java/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 5 ++--- .../main/java/com/cloud/ha/HighAvailabilityManagerImpl.java | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java index a8942678b19c..58c7c1d2d3aa 100644 --- a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java +++ b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java @@ -388,17 +388,16 @@ public DeployDestination planDeployment(VirtualMachineProfile vmProfile, Deploym HostVO host = _hostDao.findById(vm.getLastHostId()); if (host == null) { if (Boolean.TRUE.toString().equalsIgnoreCase(considerLastHostStr)) { - throw new CloudRuntimeException("Failed to deploy VM, last host doesn't exists"); + throw new CloudRuntimeException("Failed to deploy VM, last host doesn't exist"); } } else { + logger.debug("VM's last host is {}, trying to choose the same host if it is not in maintenance state", host); if (host.isInMaintenanceStates()) { if (Boolean.TRUE.toString().equalsIgnoreCase(considerLastHostStr)) { throw new CloudRuntimeException("Failed to deploy VM, last host is in maintenance state"); } } else { - logger.debug("VM's last {}, trying to choose the same host", host); lastHost = host; - DeployDestination deployDestination = deployInVmLastHost(vmProfile, plan, avoids, planner, vm, dc, offering, cpuRequested, ramRequested, volumesRequireEncryption); if (deployDestination != null) { return deployDestination; diff --git a/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java index 3b02ab196d70..fd02c5402504 100644 --- a/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java +++ b/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java @@ -843,8 +843,6 @@ public Long migrate(final HaWorkVO work) { logger.info(String.format("VM %s is running on a different host %s, skipping migration", vm, vm.getHostId())); return null; } - logger.info("Migration attempt: for VM " + vm.getUuid() + " from host id " + srcHostId + - ". Starting attempt: " + (1 + work.getTimesTried()) + "/" + _maxRetries + " times."); try { work.setStep(Step.Migrating); From 785172bdd357abe899408ad70c2bdcc7d4f0036d Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Fri, 14 Nov 2025 12:09:27 +0530 Subject: [PATCH 3/4] msg update with vm/host name --- .../java/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java index 58c7c1d2d3aa..464d3711b725 100644 --- a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java +++ b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java @@ -388,13 +388,13 @@ public DeployDestination planDeployment(VirtualMachineProfile vmProfile, Deploym HostVO host = _hostDao.findById(vm.getLastHostId()); if (host == null) { if (Boolean.TRUE.toString().equalsIgnoreCase(considerLastHostStr)) { - throw new CloudRuntimeException("Failed to deploy VM, last host doesn't exist"); + throw new CloudRuntimeException(String.format("Failed to deploy VM %s, last host doesn't exist", vm.getName())); } } else { logger.debug("VM's last host is {}, trying to choose the same host if it is not in maintenance state", host); if (host.isInMaintenanceStates()) { if (Boolean.TRUE.toString().equalsIgnoreCase(considerLastHostStr)) { - throw new CloudRuntimeException("Failed to deploy VM, last host is in maintenance state"); + throw new CloudRuntimeException(String.format("Failed to deploy VM %s, last host %s is in maintenance state", vm.getName(), host.getName())); } } else { lastHost = host; From da2b6d911271f84fc2fa166c35ca6d6a37b15eed Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Fri, 14 Nov 2025 16:04:31 +0530 Subject: [PATCH 4/4] address comments --- .../deploy/DeploymentPlanningManagerImpl.java | 55 ++++++++++--------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java index 464d3711b725..bc329d9043e9 100644 --- a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java +++ b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java @@ -378,31 +378,11 @@ public DeployDestination planDeployment(VirtualMachineProfile vmProfile, Deploym planner = getDeploymentPlannerByName(plannerName); } - Host lastHost = null; - - String considerLastHostStr = (String)vmProfile.getParameter(VirtualMachineProfile.Param.ConsiderLastHost); - boolean considerLastHost = vm.getLastHostId() != null && haVmTag == null && - (considerLastHostStr == null || Boolean.TRUE.toString().equalsIgnoreCase(considerLastHostStr)); - if (considerLastHost) { - logger.debug("This VM has last host_id: {}", vm.getLastHostId()); - HostVO host = _hostDao.findById(vm.getLastHostId()); - if (host == null) { - if (Boolean.TRUE.toString().equalsIgnoreCase(considerLastHostStr)) { - throw new CloudRuntimeException(String.format("Failed to deploy VM %s, last host doesn't exist", vm.getName())); - } - } else { - logger.debug("VM's last host is {}, trying to choose the same host if it is not in maintenance state", host); - if (host.isInMaintenanceStates()) { - if (Boolean.TRUE.toString().equalsIgnoreCase(considerLastHostStr)) { - throw new CloudRuntimeException(String.format("Failed to deploy VM %s, last host %s is in maintenance state", vm.getName(), host.getName())); - } - } else { - lastHost = host; - DeployDestination deployDestination = deployInVmLastHost(vmProfile, plan, avoids, planner, vm, dc, offering, cpuRequested, ramRequested, volumesRequireEncryption); - if (deployDestination != null) { - return deployDestination; - } - } + Host lastHost = checkDeployInVmLastHost(vmProfile, vm); + if (lastHost != null) { + DeployDestination deployDestination = deployInVmLastHost(vmProfile, plan, avoids, planner, vm, dc, offering, cpuRequested, ramRequested, volumesRequireEncryption); + if (deployDestination != null) { + return deployDestination; } } @@ -468,6 +448,31 @@ public DeployDestination planDeployment(VirtualMachineProfile vmProfile, Deploym return dest; } + private Host checkDeployInVmLastHost(VirtualMachineProfile vmProfile, VirtualMachine vm) { + String considerLastHostStr = (String)vmProfile.getParameter(VirtualMachineProfile.Param.ConsiderLastHost); + String haVmTag = (String)vmProfile.getParameter(VirtualMachineProfile.Param.HaTag); + boolean considerLastHost = vm.getLastHostId() != null && haVmTag == null && + (considerLastHostStr == null || Boolean.TRUE.toString().equalsIgnoreCase(considerLastHostStr)); + if (!considerLastHost) { + return null; + } + + logger.debug("This VM has last host_id: {}", vm.getLastHostId()); + HostVO lastHost = _hostDao.findById(vm.getLastHostId()); + if (lastHost == null) { + logger.debug("Unable to deploy VM {} in the last host, last host doesn't exist", vm.getName()); + return null; + } + + logger.debug("VM's last host is {}, trying to choose the same host if it is not in maintenance state", lastHost); + if (lastHost.isInMaintenanceStates()) { + logger.debug("Unable to deploy VM {} in the last host, last host {} is in maintenance state", vm.getName(), lastHost.getName()); + return null; + } + + return lastHost; + } + private void avoidDifferentArchResources(VirtualMachineProfile vmProfile, DataCenter dc, ExcludeList avoids) { VirtualMachineTemplate template = vmProfile.getTemplate(); for (CPU.CPUArch arch : clusterArchTypes) {