Author: kwall
Date: Mon May 26 09:24:52 2014
New Revision: 1597538
URL: http://svn.apache.org/r1597538
Log:
QPID-5715: [Java Broker] Added extra logging when transfering master to a
remote replica in order to understand sporadic test failure
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java?rev=1597538&r1=1597537&r2=1597538&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
Mon May 26 09:24:52 2014
@@ -105,6 +105,13 @@ public class BDBHARemoteReplicationNodeI
super.deleted();
}
+ @Override
+ public String toString()
+ {
+ return getClass().getSimpleName() + "[id=" + getId() + ", name=" +
getName() + ", address=" + getAddress()
+ + ", state=" + getState() + ", role=" + getRole() + "]";
+ }
+
@StateTransition(currentState = {State.ACTIVE, State.UNAVAILABLE},
desiredState = State.DELETED)
private void doDelete()
{
@@ -138,19 +145,19 @@ public class BDBHARemoteReplicationNodeI
String nodeName = getName();
if (LOGGER.isDebugEnabled())
{
- LOGGER.debug("Trying to transfer master to " + nodeName);
+ LOGGER.debug("Trying to transfer master to '" + nodeName +
"'");
}
_replicatedEnvironmentFacade.transferMasterAsynchronously(nodeName);
if (LOGGER.isDebugEnabled())
{
- LOGGER.debug("The mastership has been transferred to " +
nodeName);
+ LOGGER.debug("The transfer of mastership to node '" + nodeName
+ "' has been initiated.");
}
}
catch(Exception e)
{
- throw new IllegalConfigurationException("Cannot transfer
mastership to " + getName(), e);
+ throw new IllegalConfigurationException("Cannot transfer
mastership to '" + getName() + "'", e);
}
}
@@ -163,7 +170,8 @@ public class BDBHARemoteReplicationNodeI
String currentRole = getRole();
if (!REPLICA.name().equals(currentRole))
{
- throw new IllegalArgumentException("Cannot transfer mastership
when not a replica");
+ throw new IllegalArgumentException("Cannot transfer mastership
when not in replica role."
+ + " Current role " +
currentRole);
}
if
(!MASTER.name().equals(((BDBHARemoteReplicationNode<?>)proxyForValidation).getRole()))
{
@@ -184,6 +192,10 @@ public class BDBHARemoteReplicationNodeI
void setRole(String role)
{
+ if (LOGGER.isDebugEnabled())
+ {
+ LOGGER.debug(this + " updating role to : " + role);
+ }
_role = role;
updateModelStateFromRole(role);
}
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java?rev=1597538&r1=1597537&r2=1597538&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
Mon May 26 09:24:52 2014
@@ -277,7 +277,7 @@ public class BDBHAVirtualHostNodeTest ex
assertNodeRole(replica, "MASTER");
}
- public void testTransferMasterToReplica() throws Exception
+ public void testTransferMasterToRemoteReplica() throws Exception
{
int node1PortNumber = findFreePort();
String helperAddress = "localhost:" + node1PortNumber;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
