mirror of https://github.com/apache/cloudstack.git
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
This commit is contained in:
parent
243f566a60
commit
a10218d6eb
|
|
@ -384,13 +384,26 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
|
|||
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 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
|
|||
|
||||
protected Pair<Host, Map<Volume, StoragePool>> findPotentialDeploymentResources(List<Host> suitableHosts, Map<Volume, List<StoragePool>> suitableVolumeStoragePools,
|
||||
ExcludeList avoid, PlannerResourceUsage resourceUsageRequired, List<Volume> readyAndReusedVolumes, List<Long> 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;
|
||||
|
|
|
|||
|
|
@ -833,7 +833,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements Configur
|
|||
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 class HighAvailabilityManagerImpl extends ManagerBase implements Configur
|
|||
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 {
|
||||
|
|
|
|||
|
|
@ -1417,7 +1417,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
|
|||
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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue