zookeeper git commit: ZOOKEEPER-2718: fix flaky StandaloneDisabledTest

[hanm]

Repository: zookeeper
Updated Branches:
  refs/heads/master cf4f11951 -> 6949af062


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 <h...@apache.org>

Reviewers: Alexander Shraer <shra...@gmail.com>

Closes #190 from hanm/ZOOKEEPER-2178

(cherry picked from commit 57609043264f651cd2e44afceeca5b5890531161)
Signed-off-by: Michael Han <h...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/6949af06
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/6949af06
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/6949af06

Branch: refs/heads/master
Commit: 6949af062d5ad3cdb36c86afc3728ede78c8039d
Parents: cf4f119
Author: Michael Han <h...@apache.org>
Authored: Tue Mar 14 09:06:15 2017 -0700
Committer: Michael Han <h...@apache.org>
Committed: Tue Mar 14 09:06:28 2017 -0700

----------------------------------------------------------------------
 .../apache/zookeeper/server/quorum/StandaloneDisabledTest.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/6949af06/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));