You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ha...@apache.org on 2017/03/14 16:06:20 UTC
zookeeper git commit: ZOOKEEPER-2718: fix flaky StandaloneDisabledTest
Repository: zookeeper
Updated Branches:
refs/heads/branch-3.5 4a3ef8b65 -> 576090432
ZOOKEEPER-2718: fix flaky StandaloneDisabledTest
The flaky (that existing for a long time) is caused by a ghost server that although not appear in the quorum's config but still up and running and send requests to the quorum {2, 3, 4}. Fix is simply kill the server 1 after it's used. Verified that with the fix the test survive stress test (100+ runs) while w/o the fix the tests fails frequently, on internal Jenkins machine.
ZOOKEEPER-2718: build bot do something please.
Author: Michael Han <ha...@apache.org>
Reviewers: Alexander Shraer <sh...@gmail.com>
Closes #190 from hanm/ZOOKEEPER-2178
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/57609043
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/57609043
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/57609043
Branch: refs/heads/branch-3.5
Commit: 57609043264f651cd2e44afceeca5b5890531161
Parents: 4a3ef8b
Author: Michael Han <ha...@apache.org>
Authored: Tue Mar 14 09:06:15 2017 -0700
Committer: Michael Han <ha...@apache.org>
Committed: Tue Mar 14 09:06:15 2017 -0700
----------------------------------------------------------------------
.../apache/zookeeper/server/quorum/StandaloneDisabledTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/57609043/src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java b/src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java
index 34206cd..a50e98a 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java
+++ b/src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java
@@ -90,6 +90,9 @@ public class StandaloneDisabledTest extends QuorumPeerTestBase {
LOG.info("Configuration after removing leader and follower 1:\n"
+ new String(zkHandles[follower2].getConfig(this, new Stat())));
+ // Kill server 1 to avoid it interferences with FLE of the quorum {2, 3, 4}.
+ shutDownServer(follower1);
+
// Try to remove follower2, which is the only remaining server. This should fail.
reconfigServers.clear();
reconfigServers.add(Integer.toString(follower2));