Repository: zookeeper
Updated Branches:
refs/heads/branch-3.5 67b6767c0 -> 9affdd144
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 <maoling199210191@sina.com>
Reviewers: Patrick Hunt <phunt@apache.org>, Andor Molnár <andor@cloudera.com>,
Abraham Fine <afine@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
(cherry picked from commit d1b07d588e445085eff4abeb42cf730cc7c57e83)
Signed-off-by: Abraham Fine <afine@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/9affdd14
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/9affdd14
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/9affdd14
Branch: refs/heads/branch-3.5
Commit: 9affdd14464a97f5b634cbde9d5ff9b413137172
Parents: 67b6767
Author: maoling <maoling199210191@sina.com>
Authored: Mon Jan 29 23:02:41 2018 -0800
Committer: Abraham Fine <afine@apache.org>
Committed: Mon Jan 29 23:03:45 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/9affdd14/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 5c4bd87..0ad9235 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
+++ b/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
@@ -480,7 +480,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
@@ -1769,10 +1769,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;
|