etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.y' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.2.y

This commit is contained in:
Fang Wang 2012-09-17 15:21:50 -07:00
parent 0b03db5fd4 786ff0bfd1
commit 3d9a1c83fa
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -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);

2
server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
View File

@ -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);
}

1
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -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){