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 f63a831 ZOOKEEPER-3385: Add admin command to display leader
f63a831 is described below
commit f63a831d67bd12303a3e1578126f2a09819fecd5
Author: Brian Nixon <ni...@fb.com>
AuthorDate: Tue Jun 4 15:33:14 2019 -0700
ZOOKEEPER-3385: Add admin command to display leader
Author: Brian Nixon <ni...@fb.com>
Reviewers: Enrico Olivelli <eolive...@gmail.com>, Michael Han
<h...@apache.org>
Closes #939 from enixon/cmd-leader
---
.../apache/zookeeper/server/admin/Commands.java | 25 +++++++++++++++++
.../apache/zookeeper/server/quorum/Follower.java | 1 +
.../org/apache/zookeeper/server/quorum/Leader.java | 1 +
.../apache/zookeeper/server/quorum/Observer.java | 8 +++---
.../apache/zookeeper/server/quorum/QuorumPeer.java | 31 +++++++++++++++++++---
5 files changed, 60 insertions(+), 6 deletions(-)
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/Commands.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/Commands.java
index cff9c9b..9dd6c74 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/Commands.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/Commands.java
@@ -126,6 +126,7 @@ public class Commands {
registerCommand(new GetTraceMaskCommand());
registerCommand(new IsroCommand());
registerCommand(new LastSnapshotCommand());
+ registerCommand(new LeaderCommand());
registerCommand(new MonitorCommand());
registerCommand(new RuokCommand());
registerCommand(new SetTraceMaskCommand());
@@ -319,6 +320,30 @@ public class Commands {
}
/**
+ * Returns the leader status of this instance and the leader host string.
+ */
+ public static class LeaderCommand extends CommandBase {
+ public LeaderCommand() {
+ super(Arrays.asList("leader", "lead"));
+ }
+
+ @Override
+ public CommandResponse run(ZooKeeperServer zkServer, Map<String,
String> kwargs) {
+ CommandResponse response = initializeResponse();
+ if (zkServer instanceof QuorumZooKeeperServer) {
+ response.put("is_leader", zkServer instanceof
LeaderZooKeeperServer);
+ QuorumPeer peer = ((QuorumZooKeeperServer) zkServer).self;
+ response.put("leader_id", peer.getLeaderId());
+ String leaderAddress = peer.getLeaderAddress();
+ response.put("leader_ip", leaderAddress != null ?
leaderAddress : "");
+ } else {
+ response.put("error", "server is not initialized");
+ }
+ return response;
+ }
+ }
+
+ /**
* Some useful info for monitoring. Returned map contains:
* - "version": String
* server version
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Follower.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Follower.java
index 719734f..1d809d2 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Follower.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Follower.java
@@ -93,6 +93,7 @@ public class Follower extends Learner{
}
long startTime = Time.currentElapsedTime();
try {
+ self.setLeaderAddressAndId(leaderServer.addr,
leaderServer.getId());
syncWithLeader(newEpochZxid);
} finally {
long syncTime = Time.currentElapsedTime() - startTime;
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 7dddc72..7d566cf 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
@@ -581,6 +581,7 @@ public class Leader implements LearnerMaster {
waitForEpochAck(self.getId(), leaderStateSummary);
self.setCurrentEpoch(epoch);
+ self.setLeaderAddressAndId(self.getQuorumAddress(), self.getId());
try {
waitForNewLeaderAck(self.getId(), zk.getZxid());
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java
index 551c8fe..6e84128 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java
@@ -109,9 +109,11 @@ public class Observer extends Learner{
try {
connectToLeader(master.addr, master.hostname);
long newLeaderZxid = registerWithLeader(Leader.OBSERVERINFO);
- if (self.isReconfigStateChange())
- throw new Exception("learned about role change");
-
+ if (self.isReconfigStateChange()) {
+ throw new Exception("learned about role change");
+ }
+
+ self.setLeaderAddressAndId(master.addr, master.getId());
syncWithLeader(newLeaderZxid);
QuorumPacket qp = new QuorumPacket();
while (this.isRunning() && nextLearnerMaster.get() == null) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java
index df83df6..8e866bd 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java
@@ -41,6 +41,7 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import javax.security.sasl.SaslException;
@@ -746,12 +747,36 @@ public class QuorumPeer extends ZooKeeperThread
implements QuorumStats.Provider
}
private ServerState state = ServerState.LOOKING;
-
+
+ private AtomicReference<String> leaderAddress = new
AtomicReference<String>("");
+ private AtomicLong leaderId = new AtomicLong(-1);
+
private boolean reconfigFlag = false; // indicates that a reconfig just
committed
- public synchronized void setPeerState(ServerState newState){
- state=newState;
+ public synchronized void setPeerState(ServerState newState) {
+ state = newState;
+ if (newState == ServerState.LOOKING) {
+ setLeaderAddressAndId(null, -1);
+ }
}
+
+ public void setLeaderAddressAndId(InetSocketAddress addr, long newId) {
+ if (addr != null) {
+ leaderAddress.set(addr.getHostString());
+ } else {
+ leaderAddress.set(null);
+ }
+ leaderId.set(newId);
+ }
+
+ public String getLeaderAddress() {
+ return leaderAddress.get();
+ }
+
+ public long getLeaderId() {
+ return leaderId.get();
+ }
+
public synchronized void reconfigFlagSet(){
reconfigFlag = true;
}
