Author: orudyy
Date: Thu May 28 15:35:25 2015
New Revision: 1682262
URL: http://svn.apache.org/r1682262
Log:
NO-JIRA: Fix sporadically failing HA system test
MultiNodeTest.testTransferMasterFromReplicaNode() by ignoring
FileNotFoundException on performing REST requests to objects being in process
of creation
Modified:
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java
Modified:
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java?rev=1682262&r1=1682261&r2=1682262&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
(original)
+++
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
Thu May 28 15:35:25 2015
@@ -20,6 +20,7 @@
package org.apache.qpid.server.store.berkeleydb.replication;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.StringWriter;
import java.net.InetAddress;
@@ -450,8 +451,16 @@ public class GroupCreator
public Map<String, Object> getNodeAttributes(int localNodePort, int
remoteNodePort) throws IOException
{
RestTestHelper restHelper = createRestTestHelper(localNodePort);
- List<Map<String, Object>> results=
restHelper.getJsonAsList(getNodeRestUrl(localNodePort, remoteNodePort));
- int size = results.size();
+ List<Map<String, Object>> results = null;
+ try
+ {
+ results = restHelper.getJsonAsList(getNodeRestUrl(localNodePort,
remoteNodePort));
+ }
+ catch (FileNotFoundException e)
+ {
+ // node does not exist yet
+ }
+ int size = results == null ? 0 : results.size();
if (size == 0)
{
return Collections.emptyMap();
Modified:
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java?rev=1682262&r1=1682261&r2=1682262&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java
(original)
+++
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java
Thu May 28 15:35:25 2015
@@ -24,6 +24,7 @@ import static com.sleepycat.je.rep.Repli
import static com.sleepycat.je.rep.ReplicatedEnvironment.State.REPLICA;
import static com.sleepycat.je.rep.ReplicatedEnvironment.State.UNKNOWN;
+import java.io.FileNotFoundException;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
@@ -258,8 +259,17 @@ public class JMXManagementTest extends Q
while(!State.ACTIVE.name().equals(data.get(VirtualHost.STATE)) &&
(System.currentTimeMillis() - startTime) < 30000)
{
LOGGER.debug("Awaiting virtual host '" + nodeName + "' to transit
into active state");
- List<Map<String, Object>> results=
restHelper.getJsonAsList("virtualhost/" + nodeName + "/" + VIRTUAL_HOST);
- if (results.size()== 1)
+ List<Map<String, Object>> results= null;
+ try
+ {
+ results = restHelper.getJsonAsList("virtualhost/" + nodeName +
"/" + VIRTUAL_HOST);
+ }
+ catch (FileNotFoundException e)
+ {
+ // ignore, as host might not be open
+ }
+
+ if (results != null && results.size() == 1)
{
data = results.get(0);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
