cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject git commit: updated refs/heads/4.2 to 9d49fe8
Date Wed, 21 Aug 2013 08:00:11 GMT
Updated Branches:
  refs/heads/4.2 013f97461 -> 9d49fe8c0


CLOUDSTACK-4414
Fixing detection of failure in cluster discovery before cleanup vsm device.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d49fe8c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d49fe8c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9d49fe8c

Branch: refs/heads/4.2
Commit: 9d49fe8c0fb12324d2f132301983105b4b3dd7bc
Parents: 013f974
Author: Sateesh Chodapuneedi <sateesh@apache.org>
Authored: Wed Aug 21 07:58:13 2013 +0530
Committer: Sateesh Chodapuneedi <sateesh@apache.org>
Committed: Wed Aug 21 07:58:13 2013 +0530

----------------------------------------------------------------------
 .../cloud/hypervisor/vmware/VmwareServerDiscoverer.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d49fe8c/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
index 8a405fb..fd7b3b4 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
@@ -136,7 +136,8 @@ public class VmwareServerDiscoverer extends DiscovererBase implements
 				s_logger.info("No pod is assigned, assuming that it is not for vmware and skip it to
next discoverer");
 			return null;
 		}
-
+        boolean failureInClusterDiscovery = true;
+        String vsmIp = "";
 		ClusterVO cluster = _clusterDao.findById(clusterId);
         if(cluster == null || cluster.getHypervisorType() != HypervisorType.VMware) {
         	if(s_logger.isInfoEnabled())
@@ -308,7 +309,7 @@ public class VmwareServerDiscoverer extends DiscovererBase implements
 			if (guestTrafficLabel != null) {
                 s_logger.info("Detected guest network label : " + guestTrafficLabel);
             }
-            String vsmIp = _urlParams.get("vsmipaddress");
+            vsmIp = _urlParams.get("vsmipaddress");
             String vsmUser = _urlParams.get("vsmusername");
             String vsmPassword = _urlParams.get("vsmpassword");
             String clusterName = cluster.getName();
@@ -428,7 +429,8 @@ public class VmwareServerDiscoverer extends DiscovererBase implements
 			cluster.setGuid(UUID.nameUUIDFromBytes(
 					String.valueOf(clusterId).getBytes()).toString());
 			_clusterDao.update(clusterId, cluster);
-
+            // Flag cluster discovery success
+            failureInClusterDiscovery = false;
 			return resources;
 		} catch (DiscoveredWithErrorException e) {
 			throw e;
@@ -439,8 +441,9 @@ public class VmwareServerDiscoverer extends DiscovererBase implements
 		} finally {
 			if (context != null)
 				context.close();
-            if (vsmInfo.first()) {
+            if (failureInClusterDiscovery && vsmInfo.first()) {
                 try {
+                    s_logger.debug("Deleting Nexus 1000v VSM " + vsmIp + " because cluster
discovery and addition to zone has failed.");
                     _nexusElement.deleteCiscoNexusVSM(vsmInfo.second().longValue());
                 } catch(Exception e) {
                 }


Mime
View raw message