[jboss-cvs] JBoss Messaging SVN: r8209 - branches/port1842/src/main/org/jboss/messaging/core/impl/postoffice.

[jboss-cvs-commits at lists.jboss.org]

Author: jbertram at redhat.com
Date: 2011-02-05 20:43:39 -0500 (Sat, 05 Feb 2011)
New Revision: 8209

Modified:
   branches/port1842/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
Log:
added another DEBUG statement; corrected some formatting

Modified: branches/port1842/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- branches/port1842/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2011-02-06 01:02:02 UTC (rev 8208)
+++ branches/port1842/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2011-02-06 01:43:39 UTC (rev 8209)
@@ -595,6 +595,7 @@
             if (isDead == null)
             {
                //someone else done the job.
+               log.debug("Cluster state for node " + qNodeID + " was removed from the database; removing local information now.");
                cleanDataForNode(qNodeID);
                suspectedNodes.remove(qNodeID);
             }
@@ -605,7 +606,7 @@
                //the node may be null because it has just having a DB problem. In that case we ignore
                if (qNode == null)
                {
-                  log.debug("node " + qNodeID + " seems dead but it hasn't been suspected yet. Probably having DB problem.");
+                  log.debug("Node " + qNodeID + " seems dead but it hasn't been suspected yet. Probably having DB problem.");
                   continue;
                }
                Integer fNodeID = qNode.getFailover();
@@ -650,33 +651,32 @@
                }
             }
          }
-      //if I am quarantined, but the current view is not one member. That means 
-      //I missed the startup time join (jgroups was still bad then), but later jgroups is back
-      //to normal, so I get this chance do rejoin.
-      if (clusterState.isQuarantined(thisNodeID))
-      {
-         View currView = groupMember.getCurrentView();
-         if ((currView != null) && currView.getMembers().size() > 1)
+         //if I am quarantined, but the current view is not one member. That means 
+         //I missed the startup time join (jgroups was still bad then), but later jgroups is back
+         //to normal, so I get this chance do rejoin.
+         if (clusterState.isQuarantined(thisNodeID))
          {
-            PostOfficeAddressInfo info = new PostOfficeAddressInfo(groupMember.getControlChannelAddress(),
-                                                                   groupMember.getDataChannelAddress());
-            try
+            View currView = groupMember.getCurrentView();
+            if ((currView != null) && currView.getMembers().size() > 1)
             {
-               String clientVMId = JMSClientVMIdentifier.instance;
-               //add our vm identifier to the replicator
-               put(Replicator.JVM_ID_KEY, clientVMId);
-
-               groupMember.multicastControl(new JoinClusterRequest(thisNodeID, info), true);
-               updateStateInStorage(thisNodeID, STATE_CLUSTERED, true);
+               PostOfficeAddressInfo info = new PostOfficeAddressInfo(groupMember.getControlChannelAddress(),
+                                                                      groupMember.getDataChannelAddress());
+               try
+               {
+                  String clientVMId = JMSClientVMIdentifier.instance;
+                  //add our vm identifier to the replicator
+                  put(Replicator.JVM_ID_KEY, clientVMId);
+   
+                  groupMember.multicastControl(new JoinClusterRequest(thisNodeID, info), true);
+                  updateStateInStorage(thisNodeID, STATE_CLUSTERED, true);
+               }
+               catch (Exception e)
+               {
+                  log.error("error sending node join request!", e);
+               }
             }
-            catch (Exception e)
-            {
-               log.error("error sending node join request!", e);
-            }
          }
       }
-
-      }
       
       //timestamp and query the new state from db
       private boolean refreshNodeState() throws Exception