svn commit: r1605509 - in /zookeeper/trunk: CHANGES.txt src/java/test/org/apache/zookeeper/test/QuorumBase.java

[ph...@apache.org]

Author: phunt
Date: Wed Jun 25 17:25:28 2014
New Revision: 1605509

URL: http://svn.apache.org/r1605509
Log:
ZOOKEEPER-1939. ReconfigRecoveryTest.testNextConfigUnreachable is failing (Rakesh R via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumBase.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1605509&r1=1605508&r2=1605509&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Jun 25 17:25:28 2014
@@ -673,6 +673,9 @@ BUGFIXES:
   ZOOKEEPER-1945. deb - zkCli.sh, zkServer.sh and zkEnv.sh regression caused
   by ZOOKEEPER-1663 (Mark Flickinger via fpj)
 
+  ZOOKEEPER-1939. ReconfigRecoveryTest.testNextConfigUnreachable is
+  failing (Rakesh R via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumBase.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumBase.java?rev=1605509&r1=1605508&r2=1605509&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumBase.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumBase.java Wed Jun 25 17:25:28 2014
@@ -388,9 +388,13 @@ public class QuorumBase extends ClientBa
                 LOG.info("No election available to shutdown " + qp.getName());
             }
             LOG.info("Waiting for " + qp.getName() + " to exit thread");
-            qp.join(30000);
+            long readTimeout = qp.getTickTime() * qp.getInitLimit();
+            long connectTimeout = qp.getTickTime() * qp.getSyncLimit();
+            long maxTimeout = Math.max(readTimeout, connectTimeout);
+            maxTimeout = Math.max(maxTimeout, ClientBase.CONNECTION_TIMEOUT);
+            qp.join(maxTimeout * 2);
             if (qp.isAlive()) {
-                Assert.fail("QP failed to shutdown in 30 seconds: " + qp.getName());
+                Assert.fail("QP failed to shutdown in " + (maxTimeout * 2) + " seconds: " + qp.getName());
             }
         } catch (InterruptedException e) {
             LOG.debug("QP interrupted: " + qp.getName(), e);