From 6d8eb45bad7de079ce60f112ac0cb558a393c86f Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Mon, 11 Jul 2011 17:16:23 -0700
Subject: [PATCH] add logging to clustering notification

---
 .../com/cloud/alert/ClusterAlertAdapter.java  |  8 ++++++--
 .../com/cloud/cluster/ClusterManagerImpl.java | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/alert/ClusterAlertAdapter.java b/server/src/com/cloud/alert/ClusterAlertAdapter.java
index 4171476fa44..fd45db0a0d2 100644
--- a/server/src/com/cloud/alert/ClusterAlertAdapter.java
+++ b/server/src/com/cloud/alert/ClusterAlertAdapter.java
@@ -61,7 +61,9 @@ public class ClusterAlertAdapter implements AlertAdapter {
 
     private void onClusterNodeJoined(Object sender, ClusterNodeJoinEventArgs args) {
         if (s_logger.isDebugEnabled()) {
-            s_logger.debug("Handle cluster node join alert, self node: " + args.getSelf());
+        	for(ManagementServerHostVO mshost: args.getJoinedNodes()) {
+                s_logger.debug("Handle cluster node join alert, joined node: " + mshost.getServiceIP());
+        	}
         }
 
         for (ManagementServerHostVO mshost : args.getJoinedNodes()) {
@@ -79,7 +81,9 @@ public class ClusterAlertAdapter implements AlertAdapter {
     private void onClusterNodeLeft(Object sender, ClusterNodeLeftEventArgs args) {
 
         if (s_logger.isDebugEnabled()) {
-            s_logger.debug("Handle cluster node left alert, self node: " + args.getSelf());
+        	for(ManagementServerHostVO mshost: args.getLeftNodes()) {
+        		s_logger.debug("Handle cluster node left alert, leaving node: " + mshost.getServiceIP());
+        	}
         }
 
         for (ManagementServerHostVO mshost : args.getLeftNodes()) {
diff --git a/server/src/com/cloud/cluster/ClusterManagerImpl.java b/server/src/com/cloud/cluster/ClusterManagerImpl.java
index 60458d22ce9..ada2f5f6fda 100644
--- a/server/src/com/cloud/cluster/ClusterManagerImpl.java
+++ b/server/src/com/cloud/cluster/ClusterManagerImpl.java
@@ -470,6 +470,14 @@ public class ClusterManagerImpl implements ClusterManager {
     }
 
     public void notifyNodeJoined(List<ManagementServerHostVO> nodeList) {
+    	if(s_logger.isDebugEnabled()) {
+    		s_logger.debug("Notify management server node join to listeners.");
+    		
+    		for(ManagementServerHostVO mshost : nodeList) {
+    			s_logger.debug("Joining node, IP: " + mshost.getServiceIP() + ", msid: " + mshost.getMsid());
+    		}
+    	}
+    	
         synchronized(listeners) {
             for(ClusterManagerListener listener : listeners) {
                 listener.onManagementNodeJoined(nodeList, _mshostId);
@@ -481,6 +489,14 @@ public class ClusterManagerImpl implements ClusterManager {
     }
 
     public void notifyNodeLeft(List<ManagementServerHostVO> nodeList) {
+    	if(s_logger.isDebugEnabled()) {
+    		s_logger.debug("Notify management server node left to listeners.");
+    		
+    		for(ManagementServerHostVO mshost : nodeList) {
+    			s_logger.debug("Leaving node, IP: " + mshost.getServiceIP() + ", msid: " + mshost.getMsid());
+    		}
+    	}
+    	
         synchronized(listeners) {
             for(ClusterManagerListener listener : listeners) {
                 listener.onManagementNodeLeft(nodeList, _mshostId);
@@ -492,6 +508,9 @@ public class ClusterManagerImpl implements ClusterManager {
     }
 
     public void notifyNodeIsolated() {
+    	if(s_logger.isDebugEnabled())
+    		s_logger.debug("Notify management server node isolation to listeners");
+    	
         synchronized(listeners) {
             for(ClusterManagerListener listener : listeners) {
                 listener.onManagementNodeIsolated();