This is an automated email from the ASF dual-hosted git repository.

hanm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 8260e87  ZOOKEEPER-3841: Remove useless codes in the Leader.java
8260e87 is described below

commit 8260e876f26b4a8953b8a60a11515aab69ad1fb6
Author: dengliming <liming.d....@gmail.com>
AuthorDate: Wed Sep 30 21:23:24 2020 -0700

    ZOOKEEPER-3841: Remove useless codes in the Leader.java
    
    Author: dengliming <liming.d....@gmail.com>
    
    Reviewers: maoling, hanm
    
    Closes #1394 from dengliming/ZOOKEEPER-3841
---
 .../src/main/java/org/apache/zookeeper/server/quorum/Leader.java | 9 ---------
 1 file changed, 9 deletions(-)

diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Leader.java 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Leader.java
index 8d2a95f..0ddc4be 100644
--- 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Leader.java
+++ 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Leader.java
@@ -711,13 +711,6 @@ public class Leader extends LearnerMaster {
             self.setZabState(QuorumPeer.ZabState.BROADCAST);
             self.adminServer.setZooKeeperServer(zk);
 
-            // Everything is a go, simply start counting the ticks
-            // WARNING: I couldn't find any wait statement on a synchronized
-            // block that would be notified by this notifyAll() call, so
-            // I commented it out
-            //synchronized (this) {
-            //    notifyAll();
-            //}
             // We ping twice a tick, so we only update the tick every other
             // iteration
             boolean tickSkip = true;
@@ -937,7 +930,6 @@ public class Leader extends LearnerMaster {
             //otherwise an up-to-date follower will be designated as leader. 
This saves
             //leader election time, unless the designated leader fails
             Long designatedLeader = getDesignatedLeader(p, zxid);
-            //LOG.warn("designated leader is: " + designatedLeader);
 
             QuorumVerifier newQV = p.qvAcksetPairs.get(p.qvAcksetPairs.size() 
- 1).getQuorumVerifier();
 
@@ -954,7 +946,6 @@ public class Leader extends LearnerMaster {
             // receive the commit message.
             commitAndActivate(zxid, designatedLeader);
             informAndActivate(p, designatedLeader);
-            //turnOffFollowers();
         } else {
             
p.request.logLatency(ServerMetrics.getMetrics().QUORUM_ACK_LATENCY);
             commit(zxid);

Reply via email to