zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject zookeeper git commit: ZOOKEEPER-2316: comment does not match code logic
Date Thu, 27 Apr 2017 21:20:47 GMT
Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.5 3042a50a3 -> 7dfaeb4de


ZOOKEEPER-2316: comment does not match code logic

Fixing ZOOKEEPER-2316.

Author: Umesh Panchaksharaiah <upangit@users.noreply.github.com>
Author: Umesh Panchaksharaiah <upanchak@yahoo.com>

Reviewers: Abraham Fine <afine@apache.org>, Michael Han <hanm@apache.org>

Closes #223 from upangit/ZOOKEEPER-2316 and squashes the following commits:

7669f19 [Umesh Panchaksharaiah] ZOOKEEPER-2316: comment does not match code logic
7705e24 [Umesh Panchaksharaiah] ZOOKEEPER-2316: comment does not match code logic

(cherry picked from commit f7281f30467bfecb679f3e3d436337dfd16c810a)
Signed-off-by: Michael Han <hanm@apache.org>


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

Branch: refs/heads/branch-3.5
Commit: 7dfaeb4de04321227b48f9b6a296566067e8fc97
Parents: 3042a50
Author: Umesh Panchaksharaiah <upangit@users.noreply.github.com>
Authored: Thu Apr 27 14:20:32 2017 -0700
Committer: Michael Han <hanm@apache.org>
Committed: Thu Apr 27 14:20:43 2017 -0700

----------------------------------------------------------------------
 src/java/main/org/apache/zookeeper/server/quorum/Leader.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/7dfaeb4d/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/Leader.java b/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
index 13f7ec9..5783d9a 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
+++ b/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
@@ -724,7 +724,9 @@ public class Leader {
        // concurrent reconfigs are allowed, this can happen.
        if (outstandingProposals.containsKey(zxid - 1)) return false;
        
-       // getting a quorum from all necessary configurations
+       // in order to be committed, a proposal must be accepted by a quorum.
+       //
+       // getting a quorum from all necessary configurations.
         if (!p.hasAllQuorums()) {
            return false;                 
         }
@@ -737,8 +739,6 @@ public class Leader {
                     + (lastCommitted+1));
         }     
         
-        // in order to be committed, a proposal must be accepted by a quorum            
 
-        
         outstandingProposals.remove(zxid);
         
         if (p.request != null) {


Mime
View raw message