From 7705e24a42dcca45291cdf272107d248ee28f356 Mon Sep 17 00:00:00 2001 From: Umesh Panchaksharaiah Date: Tue, 11 Apr 2017 12:05:35 -0700 Subject: [PATCH 1/2] ZOOKEEPER-2316: comment does not match code logic --- src/java/main/org/apache/zookeeper/server/quorum/Leader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0ef5e2c6b0d..eccbb0ed5d5 100644 --- a/src/java/main/org/apache/zookeeper/server/quorum/Leader.java +++ b/src/java/main/org/apache/zookeeper/server/quorum/Leader.java @@ -724,6 +724,8 @@ synchronized public boolean tryToCommit(Proposal p, long zxid, SocketAddress fol // concurrent reconfigs are allowed, this can happen. if (outstandingProposals.containsKey(zxid - 1)) return false; + // 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 @@ synchronized public boolean tryToCommit(Proposal p, long zxid, SocketAddress fol + (lastCommitted+1)); } - // in order to be committed, a proposal must be accepted by a quorum - outstandingProposals.remove(zxid); if (p.request != null) { From 7669f19ab6dfb47e2a443708b287a637781fd366 Mon Sep 17 00:00:00 2001 From: Umesh Panchaksharaiah Date: Mon, 24 Apr 2017 17:15:16 -0700 Subject: [PATCH 2/2] ZOOKEEPER-2316: comment does not match code logic --- src/java/main/org/apache/zookeeper/server/quorum/Leader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 eccbb0ed5d5..5cd836fc28d 100644 --- a/src/java/main/org/apache/zookeeper/server/quorum/Leader.java +++ b/src/java/main/org/apache/zookeeper/server/quorum/Leader.java @@ -724,9 +724,9 @@ synchronized public boolean tryToCommit(Proposal p, long zxid, SocketAddress fol // concurrent reconfigs are allowed, this can happen. if (outstandingProposals.containsKey(zxid - 1)) return false; - // in order to be committed, a proposal must be accepted by a quorum + // in order to be committed, a proposal must be accepted by a quorum. // - // getting a quorum from all necessary configurations + // getting a quorum from all necessary configurations. if (!p.hasAllQuorums()) { return false; }