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

bug 12930: update cluster guid before sending setup agent command to kvm host 

status 12930: resolved fixed
This commit is contained in:
Edison Su 2012-01-06 11:38:55 -08:00
parent cf0116c5ca
commit e9373a57a7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
View File

@ -167,6 +167,12 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer,
return null;
}
// place a place holder guid derived from cluster ID
if (cluster.getGuid() == null) {
cluster.setGuid(UUID.nameUUIDFromBytes(String.valueOf(clusterId).getBytes()).toString());
_clusterDao.update(clusterId, cluster);
}
String parameters = " -m " + _hostIp + " -z " + dcId + " -p " + podId + " -c " + clusterId + " -g " + guid + " -a";
if (_kvmPublicNic != null) {
@ -199,12 +205,6 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer,
return null;
details.put("guid", guidWithTail);
// place a place holder guid derived from cluster ID
if (cluster.getGuid() == null) {
cluster.setGuid(UUID.nameUUIDFromBytes(String.valueOf(clusterId).getBytes()).toString());
_clusterDao.update(clusterId, cluster);
}
return resources;
} catch (DiscoveredWithErrorException e){
throw e;