CS-15256: Unable to associate cluster with Nexus VSM upon a retry if addCluster command fails the first time

Vijayendra Bhamidipati · Vijayendra Bhamidipati · commit 130893be9389 · 2012-06-18T15:04:21.000-07:00
Description:

	Putting in code to clean up stale VSM records in case
	addCluster fails to communicate with the vCenter server.
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -580,6 +580,7 @@ public List<? extends Cluster> discoverCluster(AddClusterCmd cmd) throws Illegal
             if (!success) {
                 _clusterDetailsDao.deleteDetails(clusterId);
                 _clusterDao.remove(clusterId);
+                _clusterVSMDao.removeByClusterId(clusterId);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -580,6 +580,7 @@ public List<? extends Cluster> discoverCluster(AddClusterCmd cmd) throws Illegal`
`580`	`580`	`if (!success) {`
`581`	`581`	`_clusterDetailsDao.deleteDetails(clusterId);`
`582`	`582`	`_clusterDao.remove(clusterId);`
	`583`	`+ _clusterVSMDao.removeByClusterId(clusterId);`
`583`	`584`	`}`
`584`	`585`	`}`
`585`	`586`	`}`