From e9373a57a767e769333ace3393895f86b4d49588 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Fri, 6 Jan 2012 11:38:55 -0800 Subject: [PATCH] bug 12930: update cluster guid before sending setup agent command to kvm host status 12930: resolved fixed --- .../kvm/discoverer/KvmServerDiscoverer.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java index 289d215d20f..8d761da4cc8 100755 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java @@ -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;