You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by af...@apache.org on 2018/01/30 07:03:37 UTC

zookeeper git commit: ZOOKEEPER-1580: QuorumPeer.setRunning is not used

Repository: zookeeper
Updated Branches:
  refs/heads/master 78708a858 -> d1b07d588


ZOOKEEPER-1580: QuorumPeer.setRunning is not used

- more details in [JIRA:ZOOKEEPER-1580](https://issues.apache.org/jira/browse/ZOOKEEPER-1580)
- I forget fetching the upstream codes, make a mistake in the origin [PR-446] (https://github.com/apache/zookeeper/pull/446) which includes some review history,so I close it and open a new one

Author: maoling <ma...@sina.com>

Reviewers: Patrick Hunt <ph...@apache.org>, Andor Molnár <an...@cloudera.com>, Abraham Fine <af...@apache.org>

Closes #452 from maoling/ZOOKEEPER-1580 and squashes the following commits:

29a5aba1e [maoling] remove the setter and return back to setting the running field directly
28de1e88f [maoling] ZOOKEEPER-1580:QuorumPeer.setRunning is not used


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

Branch: refs/heads/master
Commit: d1b07d588e445085eff4abeb42cf730cc7c57e83
Parents: 78708a8
Author: maoling <ma...@sina.com>
Authored: Mon Jan 29 23:02:41 2018 -0800
Committer: Abraham Fine <af...@apache.org>
Committed: Mon Jan 29 23:02:41 2018 -0800

----------------------------------------------------------------------
 .../main/org/apache/zookeeper/server/quorum/QuorumPeer.java    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/d1b07d58/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java b/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
index 45f32b9..cec1f94 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
+++ b/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
@@ -479,7 +479,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider
         currentVote = v;
     }
 
-    volatile boolean running = true;
+    private volatile boolean running = true;
 
     /**
      * The number of milliseconds of each tick
@@ -1750,10 +1750,6 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider
     public synchronized void initConfigInZKDatabase() {   
         if (zkDb != null) zkDb.initConfigInZKDatabase(getQuorumVerifier());
     }
-    
-    public void setRunning(boolean running) {
-        this.running = running;
-    }
 
     public boolean isRunning() {
         return running;