[jboss-cvs] JBossAS SVN: r108562 - in projects/cluster/ha-server-api/trunk/src: test/java/org/jboss/test/ha/framework/server and 1 other directory.

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

Author: smarlow at redhat.com
Date: 2010-10-13 16:10:37 -0400 (Wed, 13 Oct 2010)
New Revision: 108562

Modified:
   projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java
   projects/cluster/ha-server-api/trunk/src/test/java/org/jboss/test/ha/framework/server/HASingletonTestCase.java
Log:
testcase change not needed anymore, add more debug logging

Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java	2010-10-13 19:29:13 UTC (rev 108561)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java	2010-10-13 20:10:37 UTC (rev 108562)
@@ -172,8 +172,10 @@
 
       if(log.isDebugEnabled())
       {
+
          this.log.debug("partitionTopologyChanged, isElectedNewMaster=" + isElectedNewMaster + ", isMasterNode=" +
-            isMaster + ", viewID=" + newViewId + ", partition=" + getHAPartition().getPartitionName());
+            isMaster + ", viewID=" + newViewId + ", partition=" + getHAPartition().getPartitionName() +
+            ", electionPolicy=" + (electionPolicy!=null?electionPolicy.getClass().getName():"none"));
       }
       
       if (isElectedNewMaster)

Modified: projects/cluster/ha-server-api/trunk/src/test/java/org/jboss/test/ha/framework/server/HASingletonTestCase.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/test/java/org/jboss/test/ha/framework/server/HASingletonTestCase.java	2010-10-13 19:29:13 UTC (rev 108561)
+++ projects/cluster/ha-server-api/trunk/src/test/java/org/jboss/test/ha/framework/server/HASingletonTestCase.java	2010-10-13 20:10:37 UTC (rev 108562)
@@ -209,8 +209,7 @@
       
       EasyMock.expect(this.partition.getDistributedReplicantManager()).andReturn(this.drm);
       EasyMock.expect(this.drm.isMasterReplica(SERVICE_HA_NAME)).andReturn(false);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
-         
+      
       EasyMock.replay(this.partition, this.drm, this.lifecycle);
       
       this.singleton.replicantsChanged(SERVICE_HA_NAME, list, 101, true);
@@ -226,7 +225,6 @@
       
       EasyMock.expect(this.partition.getDistributedReplicantManager()).andReturn(this.drm);
       EasyMock.expect(this.drm.isMasterReplica(SERVICE_HA_NAME)).andReturn(true);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       this.partition.callAsynchMethodOnCluster(EasyMock.same(SERVICE_HA_NAME), EasyMock.eq("stopOldMaster"), EasyMock.aryEq(new Object[0]), EasyMock.aryEq(new Class[0]), EasyMock.eq(true));
       this.lifecycle.startSingleton();
@@ -246,7 +244,6 @@
       
       EasyMock.expect(this.partition.getDistributedReplicantManager()).andReturn(this.drm);
       EasyMock.expect(this.drm.isMasterReplica(SERVICE_HA_NAME)).andReturn(true);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       EasyMock.replay(this.partition, this.drm, this.lifecycle);
       
@@ -263,7 +260,6 @@
       
       EasyMock.expect(this.partition.getDistributedReplicantManager()).andReturn(this.drm);
       EasyMock.expect(this.drm.isMasterReplica(SERVICE_HA_NAME)).andReturn(true);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       this.lifecycle.stopSingleton();
       this.lifecycle.startSingleton();
@@ -285,7 +281,6 @@
       
       EasyMock.expect(this.partition.getDistributedReplicantManager()).andReturn(this.drm);
       EasyMock.expect(this.drm.isMasterReplica(SERVICE_HA_NAME)).andReturn(true);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       EasyMock.replay(this.partition, this.drm, this.lifecycle);
       
@@ -302,7 +297,6 @@
       
       EasyMock.expect(this.partition.getDistributedReplicantManager()).andReturn(this.drm);
       EasyMock.expect(this.drm.isMasterReplica(SERVICE_HA_NAME)).andReturn(false);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       this.lifecycle.stopSingleton();
       
@@ -326,7 +320,6 @@
       
       EasyMock.expect(this.partition.getDistributedReplicantManager()).andReturn(this.drm);
       EasyMock.expect(this.drm.lookupReplicantsNodes(SERVICE_HA_NAME)).andReturn(nodes);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       EasyMock.replay(this.partition, this.drm, this.lifecycle);
       
@@ -345,7 +338,6 @@
       
       EasyMock.expect(this.partition.getDistributedReplicantManager()).andReturn(this.drm);
       EasyMock.expect(this.drm.lookupReplicantsNodes(SERVICE_HA_NAME)).andReturn(nodes);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       EasyMock.replay(this.partition, this.drm, this.lifecycle);
       
@@ -368,7 +360,6 @@
       EasyMock.expect(this.partition.getDistributedReplicantManager()).andReturn(this.drm);
       EasyMock.expect(this.drm.lookupReplicantsNodes(SERVICE_HA_NAME)).andReturn(nodes);
       EasyMock.expect(this.partition.getClusterNode()).andReturn(ourNode);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       EasyMock.replay(this.partition, this.drm, this.lifecycle);
       
@@ -388,7 +379,6 @@
       EasyMock.expect(this.drm.lookupReplicantsNodes(SERVICE_HA_NAME)).andReturn(nodes);
       EasyMock.expect(this.electionPolicy.elect(nodes)).andReturn(otherNode);
       EasyMock.expect(this.partition.getClusterNode()).andReturn(ourNode);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       EasyMock.replay(this.partition, this.drm, this.lifecycle, this.electionPolicy);
       
@@ -407,7 +397,6 @@
       EasyMock.expect(this.drm.lookupReplicantsNodes(SERVICE_HA_NAME)).andReturn(nodes);
       EasyMock.expect(this.electionPolicy.elect(nodes)).andReturn(ourNode);
       EasyMock.expect(this.partition.getClusterNode()).andReturn(ourNode);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       this.partition.callAsynchMethodOnCluster(EasyMock.same(SERVICE_HA_NAME), EasyMock.eq("stopOldMaster"), EasyMock.aryEq(new Object[0]), EasyMock.aryEq(new Class[0]), EasyMock.eq(true));
       this.lifecycle.startSingleton();
@@ -431,7 +420,6 @@
       EasyMock.expect(this.drm.lookupReplicantsNodes(SERVICE_HA_NAME)).andReturn(nodes);
       EasyMock.expect(this.electionPolicy.elect(nodes)).andReturn(ourNode);
       EasyMock.expect(this.partition.getClusterNode()).andReturn(ourNode);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       EasyMock.replay(this.partition, this.drm, this.lifecycle, this.electionPolicy);
       
@@ -451,7 +439,6 @@
       EasyMock.expect(this.partition.getDistributedReplicantManager()).andReturn(this.drm);
       EasyMock.expect(this.drm.lookupReplicantsNodes(SERVICE_HA_NAME)).andReturn(nodes);
       EasyMock.expect(this.partition.getClusterNode()).andReturn(ourNode);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       EasyMock.replay(this.partition, this.drm, this.lifecycle, this.electionPolicy);
       
@@ -474,7 +461,6 @@
       EasyMock.expect(this.drm.lookupReplicantsNodes(SERVICE_HA_NAME)).andReturn(nodes);
       EasyMock.expect(this.electionPolicy.elect(nodes)).andReturn(ourNode);
       EasyMock.expect(this.partition.getClusterNode()).andReturn(ourNode);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       EasyMock.replay(this.partition, this.drm, this.lifecycle, this.electionPolicy);
       
@@ -493,7 +479,6 @@
       EasyMock.expect(this.drm.lookupReplicantsNodes(SERVICE_HA_NAME)).andReturn(nodes);
       EasyMock.expect(this.electionPolicy.elect(nodes)).andReturn(ourNode);
       EasyMock.expect(this.partition.getClusterNode()).andReturn(ourNode);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       this.lifecycle.stopSingleton();
       this.lifecycle.startSingleton();
@@ -515,7 +500,6 @@
       EasyMock.expect(this.drm.lookupReplicantsNodes(SERVICE_HA_NAME)).andReturn(nodes);
       EasyMock.expect(this.electionPolicy.elect(nodes)).andReturn(otherNode);
       EasyMock.expect(this.partition.getClusterNode()).andReturn(ourNode);
-      EasyMock.expect(this.partition.getPartitionName()).andReturn("mock partition");
 
       this.lifecycle.stopSingleton();