[jboss-cvs] JBossAS SVN: r108560 - 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
jboss-cvs-commits at lists.jboss.org
Wed Oct 13 14:52:37 EDT 2010
Author: smarlow at redhat.com
Date: 2010-10-13 14:52:37 -0400 (Wed, 13 Oct 2010)
New Revision: 108560
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:
show partition name if debug logging is enabled
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 18:00:08 UTC (rev 108559)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java 2010-10-13 18:52:37 UTC (rev 108560)
@@ -169,9 +169,13 @@
boolean isElectedNewMaster = this.elected();
boolean isMaster = this.master.get();
+
+ if(log.isDebugEnabled())
+ {
+ this.log.debug("partitionTopologyChanged, isElectedNewMaster=" + isElectedNewMaster + ", isMasterNode=" +
+ isMaster + ", viewID=" + newViewId + ", partition=" + getHAPartition().getPartitionName());
+ }
- this.log.debug("partitionTopologyChanged, isElectedNewMaster=" + isElectedNewMaster + ", isMasterNode=" + isMaster + ", viewID=" + newViewId);
-
if (isElectedNewMaster)
{
// if this node is already the master, don't bother electing it again
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 18:00:08 UTC (rev 108559)
+++ projects/cluster/ha-server-api/trunk/src/test/java/org/jboss/test/ha/framework/server/HASingletonTestCase.java 2010-10-13 18:52:37 UTC (rev 108560)
@@ -209,7 +209,8 @@
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);
@@ -225,7 +226,8 @@
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();
@@ -244,7 +246,8 @@
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);
this.singleton.replicantsChanged(SERVICE_HA_NAME, list, 101, false);
@@ -260,6 +263,7 @@
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();
@@ -281,7 +285,8 @@
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);
this.singleton.replicantsChanged(SERVICE_HA_NAME, list, 101, true);
@@ -297,6 +302,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");
this.lifecycle.stopSingleton();
@@ -320,7 +326,8 @@
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);
this.singleton.replicantsChanged(SERVICE_HA_NAME, list, 101, true);
@@ -338,7 +345,8 @@
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);
this.singleton.replicantsChanged(SERVICE_HA_NAME, list, 101, true);
@@ -360,7 +368,8 @@
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.singleton.replicantsChanged(SERVICE_HA_NAME, list, 101, true);
@@ -379,7 +388,8 @@
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);
this.singleton.replicantsChanged(SERVICE_HA_NAME, list, 101, true);
@@ -397,7 +407,8 @@
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();
@@ -420,7 +431,8 @@
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);
this.singleton.replicantsChanged(SERVICE_HA_NAME, list, 101, true);
@@ -439,7 +451,8 @@
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);
this.singleton.replicantsChanged(SERVICE_HA_NAME, list, 101, true);
@@ -461,7 +474,8 @@
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);
this.singleton.replicantsChanged(SERVICE_HA_NAME, list, 101, false);
@@ -479,6 +493,7 @@
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();
@@ -500,6 +515,7 @@
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();
More information about the jboss-cvs-commits
mailing list