From eb2ff4bfcce0e34d368e17933ec9a0c9f70505c4 Mon Sep 17 00:00:00 2001 From: Koushik Das Date: Tue, 11 Sep 2012 15:56:18 +0530 Subject: [PATCH 1/2] CS-15603 : CloudStack failing to stop vm's when destroyVM is called Updated fullSync operation to ignore VMs which doesn't follow CS naming convention Reviewed-by: Abhi --- server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index efce9718421..3b92a4c3f36 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -1725,6 +1725,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene } for (final AgentVmInfo left : infos.values()) { + if (!VirtualMachineName.isValidVmName(left.name)) continue; // if the vm doesn't follow CS naming ignore it for stopping try { Host host = _hostDao.findByGuid(left.getHostUuid()); if (host != null){ From 786ff0bfd17086a69b769595b5ac672cc8b786a7 Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Wed, 12 Sep 2012 10:01:36 -0700 Subject: [PATCH 2/2] CS-15546, better log message --- server/src/com/cloud/agent/manager/AgentManagerImpl.java | 2 +- .../cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index 00ad5556d27..10900382cd4 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -1140,7 +1140,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager { } } else if (e instanceof HypervisorVersionChangedException) { handleDisconnect(attache, Event.HypervisorVersionChanged, true); - throw new CloudRuntimeException("Unable to connect " + attache.getId(), e); + throw new CloudRuntimeException("Hypervisor Version Changed, disconnect host " + attache.getId() + " will reconnect later", e); } else { s_logger.error("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + " due to " + e.getMessage(), e); handleDisconnect(attache, Event.AgentDisconnected, true); diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index 9fcc7e96384..b999440776c 100755 --- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -559,10 +559,10 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L throw new RuntimeException(msg); } if (! resource.equals(host.getResource()) ) { + String msg = "host " + host.getPrivateIpAddress() + " changed from " + host.getResource() + " to " + resource; host.setResource(resource); host.setSetup(false); _hostDao.update(agentId, host); - String msg = "host " + host.getPrivateIpAddress() + " changed from " + host.getResource() + " to " + resource; s_logger.debug(msg); throw new HypervisorVersionChangedException(msg); }