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

bug 10949: if a cluster doesn't have any hosts, set cluster guid to new one when add host to this cluster. 

status 10949: resolved fixed
This commit is contained in:
anthony 2011-09-13 13:50:04 -07:00
parent 5df69e4a21
commit 48387ef907
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,18 +169,23 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
if ( clu.getGuid()== null ) {
clu.setGuid(poolUuid);
} else {
if( !clu.getGuid().equals(poolUuid)) {
if (hosts.size() == 1 ) {
if( !addHostsToPool(conn, hostIp, clusterId)){
String msg = "Unable to add host(" + hostIp + ") to cluster " + clusterId;
List<HostVO> clusterHosts = _hostDao.listByCluster(clusterId);
if( clusterHosts != null && clusterHosts.size() > 0) {
if (!clu.getGuid().equals(poolUuid)) {
if (hosts.size() == 1) {
if (!addHostsToPool(conn, hostIp, clusterId)) {
String msg = "Unable to add host(" + hostIp + ") to cluster " + clusterId;
s_logger.warn(msg);
throw new DiscoveryException(msg);
}
} else {
String msg = "Host (" + hostIp + ") is already in pool(" + poolUuid + "), can to join pool(" + clu.getGuid() + ")";
s_logger.warn(msg);
throw new DiscoveryException(msg);
throw new DiscoveryException(msg);
}
} else {
String msg = "Host (" + hostIp + ") is already in pool(" + poolUuid +"), can to join pool(" + clu.getGuid() + ")";
s_logger.warn(msg);
throw new DiscoveryException(msg);
}
} else {
clu.setGuid(poolUuid);
}
}
// can not use this conn after this point, because this host may join a pool, this conn is retired