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/04/05 00:02:55 UTC

zookeeper git commit: ZOOKEEPER-2746: remove the check on the new leader after a dynamic re…

Repository: zookeeper
Updated Branches:
  refs/heads/master d8adc547f -> d061f1b5a


ZOOKEEPER-2746: remove the check on the new leader after a dynamic re\u2026

\u2026config operation.

This check might not always hold because the nominated leader could fail to lead the quorum during sync phase - for example if sync time out [when waiting for quorum ack](https://github.com/apache/zookeeper/blob/master/src/java/main/org/apache/zookeeper/server/quorum/Leader.java#L1232). I am thinking we should just remove this instead of fixing it because the nominated leader is not an interface level contract / guarantee but a best effort / implementation level details.

Author: Michael Han <ha...@apache.org>

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

Closes #213 from hanm/ZOOKEEPER-2746


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

Branch: refs/heads/master
Commit: d061f1b5a5eca108e566a68e6f7aa07913c90ac3
Parents: d8adc54
Author: Michael Han <ha...@apache.org>
Authored: Tue Apr 4 17:02:55 2017 -0700
Committer: Michael Han <ha...@apache.org>
Committed: Tue Apr 4 17:02:55 2017 -0700

----------------------------------------------------------------------
 src/java/test/org/apache/zookeeper/test/ReconfigTest.java | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/d061f1b5/src/java/test/org/apache/zookeeper/test/ReconfigTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/test/ReconfigTest.java b/src/java/test/org/apache/zookeeper/test/ReconfigTest.java
index c4658ca..49de3f7 100644
--- a/src/java/test/org/apache/zookeeper/test/ReconfigTest.java
+++ b/src/java/test/org/apache/zookeeper/test/ReconfigTest.java
@@ -678,7 +678,6 @@ public class ReconfigTest extends ZKTestCase implements DataCallback{
 
         Assert.assertTrue(qu.getPeer(leaderIndex).peer.getQuorumAddress()
                 .getPort() == newQuorumPort);
-        Assert.assertTrue(getLeaderId(qu) != leaderIndex); // the leader changed
 
         joiningServers.clear();