From ccb006f25655d8daaad020e3a6270ea77bdb6ed1 Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Mon, 26 May 2014 09:24:52 +0000
Subject: QPID-5715: [Java Broker] Added extra logging when transfering master
 to a remote replica in order to understand sporadic test failure

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1597538 13f79535-47bb-0310-9956-ffa450edef68
---
 .../berkeleydb/BDBHARemoteReplicationNodeImpl.java   | 20 ++++++++++++++++----
 .../store/berkeleydb/BDBHAVirtualHostNodeTest.java   |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
index 9c7fa65928..4b5683b794 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
@@ -105,6 +105,13 @@ public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDB
         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 BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDB
             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 BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDB
             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 BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDB
 
     void setRole(String role)
     {
+        if (LOGGER.isDebugEnabled())
+        {
+            LOGGER.debug(this + " updating role to : " + role);
+        }
         _role = role;
         updateModelStateFromRole(role);
     }
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
index 347c91a18b..f28828db18 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
@@ -277,7 +277,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
         assertNodeRole(replica, "MASTER");
     }
 
-    public void testTransferMasterToReplica() throws Exception
+    public void testTransferMasterToRemoteReplica() throws Exception
     {
         int node1PortNumber = findFreePort();
         String helperAddress = "localhost:" + node1PortNumber;
-- 
cgit v1.2.1