[jboss-cvs] JBoss Messaging SVN: r1713 - in branches/Branch_Client_Failover_Experiment: src/main/org/jboss/jms/server/connectionfactory tests/src/org/jboss/test/messaging/jms/clustering

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

Author: clebert.suconic at jboss.com
Date: 2006-12-06 17:37:53 -0500 (Wed, 06 Dec 2006)
New Revision: 1713

Modified:
   branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
   branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringBase.java
   branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
Log:
Adding tracing for debug

Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java	2006-12-06 11:43:33 UTC (rev 1712)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java	2006-12-06 22:37:53 UTC (rev 1713)
@@ -182,6 +182,9 @@
          }
       }
 
+      log.trace("Removing delegate from delegates list with key=" + uniqueName + " at serverPeerID=" +
+                  this.serverPeer.getServerPeerID());
+
       ClientConnectionFactoryDelegate delegate =
          (ClientConnectionFactoryDelegate)delegates.remove(uniqueName);
       
@@ -245,7 +248,7 @@
    
    public synchronized void onReplicationChange(Serializable key, Map updatedReplicantMap)
    {
-      log.info("Got replication call " + key + " replicants=" + updatedReplicantMap);
+      log.info("Got replication call " + key + " node=" + serverPeer.getServerPeerID() + " replicants=" + updatedReplicantMap);
       try
       {
          // The list of connection factories across the cluster has changed, so we need to update
@@ -339,6 +342,8 @@
          int nodeID = ((Integer)entry.getKey()).intValue();
          int failoverNodeID = replicator.getFailoverNodeID(nodeID);
 
+         log.trace("setFailoverDelegates inside forIterator::nodeID=" + nodeID + " failoverNodeID=" + failoverNodeID);
+
          nodesIDs[idx] = nodeID;
          failoverNodeIDs[idx] = failoverNodeID;
          delegates[idx] = (ClientConnectionFactoryDelegate)entry.getValue();
@@ -366,7 +371,7 @@
          
          if (failoverIndex == -1)
          {
-            throw new IllegalStateException("Failover node is not in list of nodes at node " + serverPeer.getServerPeerID() + "!");
+            throw new IllegalStateException("Failover node " + failoverNode + " is not in list of nodes at node " + serverPeer.getServerPeerID() + "!");
          }
          
          failoverIndexes[i] = failoverIndex;

Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringBase.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringBase.java	2006-12-06 11:43:33 UTC (rev 1712)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringBase.java	2006-12-06 22:37:53 UTC (rev 1713)
@@ -81,6 +81,13 @@
    {
       super.setUp();
 
+      String banner =
+         "####################################################### Start " +
+         (isRemote() ? "REMOTE" : "IN-VM") + " test: " + getName();
+
+      ServerManagement.log(ServerManagement.INFO,banner);
+
+
       try
       {
          startServer(0);

Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java	2006-12-06 11:43:33 UTC (rev 1712)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java	2006-12-06 22:37:53 UTC (rev 1713)
@@ -70,6 +70,8 @@
          ServerManagement.log(ServerManagement.INFO,"Stopping server 2 as part of testConnectionFactoryConnect");
          ServerManagement.stop(2,true);
 
+         ServerManagement.log(ServerManagement.INFO,"##### Looking up ConnectionFactory at testConnectionFactoryConnect");
+
          factory =  (JBossConnectionFactory )ic1.lookup("/ConnectionFactory");
          delegate = (ClusteredClientConnectionFactoryDelegate)factory.getDelegate();