Author: orudyy
Date: Mon Jun 1 12:14:00 2015
New Revision: 1682880
URL: http://svn.apache.org/r1682880
Log:
QPID-6562: Fix sporadic failure of system test
BDBHAVirtualHostNodeRestTest#testMutateStateOfOneNode
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java?rev=1682880&r1=1682879&r2=1682880&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
(original)
+++
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
Mon Jun 1 12:14:00 2015
@@ -68,11 +68,7 @@ public class BDBHARemoteReplicationNodeI
_broker = virtualHostNode.getParent(Broker.class);
_address = (String)attributes.get(ADDRESS);
_replicatedEnvironmentFacade = replicatedEnvironmentFacade;
- setState(State.ACTIVE);
-
- _role = NodeRole.UNREACHABLE;
- _lastKnownRole = NodeRole.UNREACHABLE;
-
+ setRole(NodeRole.UNREACHABLE);
_isMonitor = (Boolean)attributes.get(MONITOR);
}
Modified:
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java?rev=1682880&r1=1682879&r2=1682880&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
(original)
+++
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
Mon Jun 1 12:14:00 2015
@@ -113,12 +113,20 @@ public class BDBHAVirtualHostNodeRestTes
assertActualAndDesiredStates(node2Url, "ACTIVE", "ACTIVE");
assertActualAndDesiredStates(node3Url, "ACTIVE", "ACTIVE");
+ // verify that remote nodes for node1 are created and their state is
set to ACTIVE
+ waitForAttributeChanged("replicationnode/" + NODE2 + "/" + NODE1,
BDBHARemoteReplicationNode.STATE, "ACTIVE");
+ waitForAttributeChanged("replicationnode/" + NODE3 + "/" + NODE1,
BDBHARemoteReplicationNode.STATE, "ACTIVE");
+
mutateDesiredState(node1Url, "STOPPED");
assertActualAndDesiredStates(node1Url, "STOPPED", "STOPPED");
assertActualAndDesiredStates(node2Url, "ACTIVE", "ACTIVE");
assertActualAndDesiredStates(node3Url, "ACTIVE", "ACTIVE");
+ // verify that remote node state fro node1 is changed to UNAVAILABLE
+ waitForAttributeChanged("replicationnode/" + NODE2 + "/" + NODE1,
BDBHARemoteReplicationNode.STATE, "UNAVAILABLE");
+ waitForAttributeChanged("replicationnode/" + NODE3 + "/" + NODE1,
BDBHARemoteReplicationNode.STATE, "UNAVAILABLE");
+
List<Map<String, Object>> remoteNodes =
getRestTestHelper().getJsonAsList("replicationnode/" + NODE2);
assertEquals("Unexpected number of remote nodes on " + NODE2, 2,
remoteNodes.size());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
