You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by fp...@apache.org on 2014/01/27 14:38:03 UTC
svn commit: r1561673 - in /zookeeper/branches/branch-3.4: CHANGES.txt
src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java
Author: fpj
Date: Mon Jan 27 13:38:03 2014
New Revision: 1561673
URL: http://svn.apache.org/r1561673
Log:
ZOOKEEPER-1867. Bug in ZkDatabaseCorruptionTest (fpj)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1561673&r1=1561672&r2=1561673&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Mon Jan 27 13:38:03 2014
@@ -230,6 +230,8 @@ BUGFIXES:
ZOOKEEPER-1858. JMX checks - potential race conditions while stopping
and starting server (Rakesh R via fpj)
+ ZOOKEEPER-1867. Bug in ZkDatabaseCorruptionTest (fpj)
+
IMPROVEMENTS:
ZOOKEEPER-1564. Allow JUnit test build with IBM Java
Modified: zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java?rev=1561673&r1=1561672&r2=1561673&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java (original)
+++ zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java Mon Jan 27 13:38:03 2014
@@ -121,12 +121,16 @@ public class ZkDatabaseCorruptionTest ex
}
//wait for servers to be up
String[] list = qb.hostPort.split(",");
- for (int i =0; i < 4; i++) {
- String hp = list[i];
- Assert.assertTrue("waiting for server up",
- ClientBase.waitForServerUp(hp,
- CONNECTION_TIMEOUT));
- LOG.info(hp + " is accepting client connections");
+ for (int i = 0; i < 5; i++) {
+ if(leaderSid != (i + 1)) {
+ String hp = list[i];
+ Assert.assertTrue("waiting for server up",
+ ClientBase.waitForServerUp(hp,
+ CONNECTION_TIMEOUT));
+ LOG.info("{} is accepting client connections", hp);
+ } else {
+ LOG.info("Skipping the leader");
+ }
}
zk = qb.createClient();