From b87c5ba3318838efc9e00d6cfcce8db670f810d0 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Wed, 17 Aug 2011 18:06:30 +0530 Subject: [PATCH] bug 11148: VMs that got stopped during Host Maintenance have host_id associated with them status 11148: resolved fixed enabled vm stop, if the host is last valid host in cluster --- server/src/com/cloud/agent/manager/AgentManagerImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index 4fd9150e9cc..e6ff0954ad7 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -1634,10 +1634,10 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager { } List hosts = _hostDao.listBy(host.getClusterId(), host.getPodId(), host.getDataCenterId()); - + List upHosts = _hostDao.listBy( host.getDataCenterId(), host.getPodId(), host.getClusterId(), Host.Type.Routing, Status.Up); for (final VMInstanceVO vm : vms) { - if (hosts == null || hosts.size() <= 1 || !answer.getMigrate()) { - // for the last host in this cluster, stop all the VMs + if (hosts == null || hosts.size() <= 1 || !answer.getMigrate() || upHosts == null || upHosts.size() == 0) { + // for the last valid host in this cluster, stop all the VMs _haMgr.scheduleStop(vm, hostId, WorkType.ForceStop); } else { _haMgr.scheduleMigration(vm);