Allow cluster management confliction detection to handle quick manageemnt server restarts

Kelven Yang · Kelven Yang · commit fa0dd8a228e7 · 2011-03-28T15:14:51.000-07:00
diff --git a/server/src/com/cloud/cluster/ClusterManagerImpl.java b/server/src/com/cloud/cluster/ClusterManagerImpl.java
@@ -934,14 +934,22 @@ private void checkConflicts() throws ConfigurationException {
     		String peerIP = peer.getServiceIP().trim();
     		if(_clusterNodeIP.equals(peerIP)) {
     			if("127.0.0.1".equals(_clusterNodeIP)) {
-    				String msg = "Detected another management node with localhost IP is already running, please check your cluster configuration";
-    				s_logger.error(msg);
-					throw new ConfigurationException(msg);
+    				if(pingManagementNode(peer.getMsid())) {
+	    				String msg = "Detected another management node with localhost IP is already running, please check your cluster configuration";
+	    				s_logger.error(msg);
+						throw new ConfigurationException(msg);
+    				} else {
+	    				String msg = "Detected another management node with localhost IP is considered as running in DB, however it is not pingable, we will continue cluster initialization with this management server node";
+	    				s_logger.info(msg);
+    				}
     			} else {
-    				if(!pingManagementNode(peer.getMsid())) {
-    					String msg = "Detected that another management node with the same IP " + peer.getServiceIP() + " is already running";
+    				if(pingManagementNode(peer.getMsid())) {
+    					String msg = "Detected that another management node with the same IP " + peer.getServiceIP() + " is already running, please check your cluster configuration";
         				s_logger.error(msg);
     					throw new ConfigurationException(msg);
+    				} else {
+    					String msg = "Detected that another management node with the same IP " + peer.getServiceIP() + " is considered as running in DB, however it is not pingable, we will continue cluster initialization with this management server node";
+	    				s_logger.info(msg);
     				}
     			}
     		}
diff --git a/utils/src/com/cloud/utils/exception/ExceptionUtil.java b/utils/src/com/cloud/utils/exception/ExceptionUtil.java
@@ -23,11 +23,11 @@
 public class ExceptionUtil {
     public static String toString(Throwable th) {
         final StringWriter writer = new StringWriter();
+		writer.append("Exception: " + th.getClass().getName() + "\n");
         writer.append("Message: ");
         writer.append(th.getMessage());
         writer.append("\n  Stack: ");
         th.printStackTrace(new PrintWriter(writer));
         return writer.toString();
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,11 @@`
`23`	`23`	`public class ExceptionUtil {`
`24`	`24`	`public static String toString(Throwable th) {`
`25`	`25`	`final StringWriter writer = new StringWriter();`
	`26`	`+ writer.append("Exception: " + th.getClass().getName() + "\n");`
`26`	`27`	`writer.append("Message: ");`
`27`	`28`	`writer.append(th.getMessage());`
`28`	`29`	`writer.append("\n Stack: ");`
`29`	`30`	`th.printStackTrace(new PrintWriter(writer));`
`30`	`31`	`return writer.toString();`
`31`	`32`	`}`
`32`		`-`
`33`	`33`	`}`