From d3879db1ed019892373683694663b05ade0db6fe Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Wed, 2 Nov 2022 05:26:12 +0000 Subject: ZOOKEEPER-4460: QuorumPeer overrides Thread.getId with different semantics. --- .../apache/zookeeper/server/admin/Commands.java | 2 +- .../server/quorum/AckRequestProcessor.java | 2 +- .../server/quorum/FastLeaderElection.java | 28 +++++++++---------- .../org/apache/zookeeper/server/quorum/Leader.java | 32 +++++++++++----------- .../server/quorum/LeaderZooKeeperServer.java | 4 +-- .../apache/zookeeper/server/quorum/Learner.java | 2 +- .../server/quorum/LearnerZooKeeperServer.java | 4 +-- .../zookeeper/server/quorum/LocalPeerBean.java | 6 ++-- .../apache/zookeeper/server/quorum/QuorumBean.java | 2 +- .../zookeeper/server/quorum/QuorumCnxManager.java | 26 +++++++++--------- .../apache/zookeeper/server/quorum/QuorumPeer.java | 28 +++++++++---------- .../server/quorum/ReadOnlyZooKeeperServer.java | 4 +-- .../zookeeper/server/PrepRequestProcessorTest.java | 2 +- .../zookeeper/server/quorum/CnxManagerTest.java | 12 ++++---- .../server/quorum/FuzzySnapshotRelatedTest.java | 2 +- .../zookeeper/server/quorum/LeaderBeanTest.java | 2 +- .../server/quorum/LeaderWithObserverTest.java | 6 ++-- .../zookeeper/server/quorum/LocalPeerBeanTest.java | 4 +-- .../zookeeper/server/quorum/QuorumBeanTest.java | 2 +- .../apache/zookeeper/server/quorum/Zab1_0Test.java | 2 +- .../java/org/apache/zookeeper/test/FLETest.java | 16 +++++------ .../apache/zookeeper/test/FLEZeroWeightTest.java | 2 +- .../apache/zookeeper/test/ObserverMasterTest.java | 4 +-- .../java/org/apache/zookeeper/test/QuorumTest.java | 4 +-- 24 files changed, 99 insertions(+), 99 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 705c6cc36..236c7ec24 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 @@ -827,7 +827,7 @@ public class Commands { QuorumPeer.ZabState zabState = peer.getZabState(); QuorumVerifier qv = peer.getQuorumVerifier(); - QuorumPeer.QuorumServer voter = qv.getVotingMembers().get(peer.getId()); + QuorumPeer.QuorumServer voter = qv.getVotingMembers().get(peer.getMyId()); boolean voting = ( voter != null && voter.addr.equals(peer.getQuorumAddress()) diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/AckRequestProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/AckRequestProcessor.java index 32eb8a818..f277dcdf3 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/AckRequestProcessor.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/AckRequestProcessor.java @@ -44,7 +44,7 @@ class AckRequestProcessor implements RequestProcessor { QuorumPeer self = leader.self; if (self != null) { request.logLatency(ServerMetrics.getMetrics().PROPOSAL_ACK_CREATION_LATENCY); - leader.processAck(self.getId(), request.zxid, null); + leader.processAck(self.getMyId(), request.zxid, null); } else { LOG.error("Null QuorumPeer"); } diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java index 654ed1cef..91207d110 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java @@ -307,7 +307,7 @@ public class FastLeaderElection implements Election { QuorumVerifier curQV = self.getQuorumVerifier(); if (rqv.getVersion() > curQV.getVersion()) { LOG.info("{} Received version: {} my version: {}", - self.getId(), + self.getMyId(), Long.toHexString(rqv.getVersion()), Long.toHexString(self.getQuorumVerifier().getVersion())); if (self.getPeerState() == ServerState.LOOKING) { @@ -356,7 +356,7 @@ public class FastLeaderElection implements Election { sendqueue.offer(notmsg); } else { // Receive new message - LOG.debug("Receive new notification message. My id = {}", self.getId()); + LOG.debug("Receive new notification message. My id = {}", self.getMyId()); // State of peer that sent this message QuorumPeer.ServerState ackstate = QuorumPeer.ServerState.LOOKING; @@ -446,7 +446,7 @@ public class FastLeaderElection implements Election { LOG.debug( "Sending new notification. My id ={} recipient={} zxid=0x{} leader={} config version = {}", - self.getId(), + self.getMyId(), response.sid, Long.toHexString(current.getZxid()), current.getId(), @@ -535,12 +535,12 @@ public class FastLeaderElection implements Election { this.ws = new WorkerSender(manager); - this.wsThread = new Thread(this.ws, "WorkerSender[myid=" + self.getId() + "]"); + this.wsThread = new Thread(this.ws, "WorkerSender[myid=" + self.getMyId() + "]"); this.wsThread.setDaemon(true); this.wr = new WorkerReceiver(manager); - this.wrThread = new Thread(this.wr, "WorkerReceiver[myid=" + self.getId() + "]"); + this.wrThread = new Thread(this.wr, "WorkerReceiver[myid=" + self.getMyId() + "]"); this.wrThread.setDaemon(true); } @@ -663,7 +663,7 @@ public class FastLeaderElection implements Election { "About to leave FLE instance: leader={}, zxid=0x{}, my id={}, my state={}", v.getId(), Long.toHexString(v.getZxid()), - self.getId(), + self.getMyId(), self.getPeerState()); recvqueue.clear(); } @@ -708,7 +708,7 @@ public class FastLeaderElection implements Election { Long.toHexString(proposedZxid), Long.toHexString(logicalclock.get()), sid, - self.getId(), + self.getMyId(), Long.toHexString(proposedEpoch)); sendqueue.offer(notmsg); @@ -800,7 +800,7 @@ public class FastLeaderElection implements Election { * from leader stating that it is leading, then predicate is false. */ - if (leader != self.getId()) { + if (leader != self.getMyId()) { if (votes.get(leader) == null) { predicate = false; } else if (votes.get(leader).getState() != ServerState.LEADING) { @@ -839,10 +839,10 @@ public class FastLeaderElection implements Election { */ private ServerState learningState() { if (self.getLearnerType() == LearnerType.PARTICIPANT) { - LOG.debug("I am a participant: {}", self.getId()); + LOG.debug("I am a participant: {}", self.getMyId()); return ServerState.FOLLOWING; } else { - LOG.debug("I am an observer: {}", self.getId()); + LOG.debug("I am an observer: {}", self.getMyId()); return ServerState.OBSERVING; } } @@ -853,8 +853,8 @@ public class FastLeaderElection implements Election { * @return long */ private long getInitId() { - if (self.getQuorumVerifier().getVotingMembers().containsKey(self.getId())) { - return self.getId(); + if (self.getQuorumVerifier().getVotingMembers().containsKey(self.getMyId())) { + return self.getMyId(); } else { return Long.MIN_VALUE; } @@ -897,7 +897,7 @@ public class FastLeaderElection implements Election { * the leadingVoteSet if it becomes the leader. */ private void setPeerState(long proposedLeader, SyncedLearnerTracker voteSet) { - ServerState ss = (proposedLeader == self.getId()) ? ServerState.LEADING : learningState(); + ServerState ss = (proposedLeader == self.getMyId()) ? ServerState.LEADING : learningState(); self.setPeerState(ss); if (ss == ServerState.LEADING) { leadingVoteSet = voteSet; @@ -945,7 +945,7 @@ public class FastLeaderElection implements Election { LOG.info( "New election. My id = {}, proposed zxid=0x{}", - self.getId(), + self.getMyId(), Long.toHexString(proposedZxid)); sendNotifications(); 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 ce8f7999c..aebde0524 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 @@ -271,8 +271,8 @@ public class Leader extends LearnerMaster { */ public boolean isQuorumSynced(QuorumVerifier qv) { HashSet ids = new HashSet(); - if (qv.getVotingMembers().containsKey(self.getId())) { - ids.add(self.getId()); + if (qv.getVotingMembers().containsKey(self.getMyId())) { + ids.add(self.getMyId()); } synchronized (forwardingFollowers) { for (LearnerHandler learnerHandler : forwardingFollowers) { @@ -603,7 +603,7 @@ public class Leader extends LearnerMaster { cnxAcceptor = new LearnerCnxAcceptor(); cnxAcceptor.start(); - long epoch = getEpochToPropose(self.getId(), self.getAcceptedEpoch()); + long epoch = getEpochToPropose(self.getMyId(), self.getAcceptedEpoch()); zk.setZxid(ZxidUtils.makeZxid(epoch, 0)); @@ -658,13 +658,13 @@ public class Leader extends LearnerMaster { // us. We do this by waiting for the NEWLEADER packet to get // acknowledged - waitForEpochAck(self.getId(), leaderStateSummary); + waitForEpochAck(self.getMyId(), leaderStateSummary); self.setCurrentEpoch(epoch); - self.setLeaderAddressAndId(self.getQuorumAddress(), self.getId()); + self.setLeaderAddressAndId(self.getQuorumAddress(), self.getMyId()); self.setZabState(QuorumPeer.ZabState.SYNCHRONIZATION); try { - waitForNewLeaderAck(self.getId(), zk.getZxid()); + waitForNewLeaderAck(self.getMyId(), zk.getZxid()); } catch (InterruptedException e) { shutdown("Waiting for a quorum of followers, only synced with sids: [ " + newLeaderProposal.ackSetsToString() @@ -746,7 +746,7 @@ public class Leader extends LearnerMaster { syncedAckSet.addQuorumVerifier(self.getLastSeenQuorumVerifier()); } - syncedAckSet.addAck(self.getId()); + syncedAckSet.addAck(self.getMyId()); for (LearnerHandler f : getLearners()) { if (f.synced()) { @@ -870,15 +870,15 @@ public class Leader extends LearnerMaster { //check if I'm in the new configuration with the same quorum address - // if so, I'll remain the leader - if (newQVAcksetPair.getQuorumVerifier().getVotingMembers().containsKey(self.getId()) - && newQVAcksetPair.getQuorumVerifier().getVotingMembers().get(self.getId()).addr.equals(self.getQuorumAddress())) { - return self.getId(); + if (newQVAcksetPair.getQuorumVerifier().getVotingMembers().containsKey(self.getMyId()) + && newQVAcksetPair.getQuorumVerifier().getVotingMembers().get(self.getMyId()).addr.equals(self.getQuorumAddress())) { + return self.getMyId(); } // start with an initial set of candidates that are voters from new config that // acknowledged the reconfig op (there must be a quorum). Choose one of them as // current leader candidate HashSet candidates = new HashSet(newQVAcksetPair.getAckset()); - candidates.remove(self.getId()); // if we're here, I shouldn't be the leader + candidates.remove(self.getMyId()); // if we're here, I shouldn't be the leader long curCandidate = candidates.iterator().next(); //go over outstanding ops in order, and try to find a candidate that acked the most ops. @@ -960,7 +960,7 @@ public class Leader extends LearnerMaster { self.processReconfig(newQV, designatedLeader, zk.getZxid(), true); - if (designatedLeader != self.getId()) { + if (designatedLeader != self.getMyId()) { LOG.info(String.format("Committing a reconfiguration (reconfigEnabled=%s); this leader is not the designated " + "leader anymore, setting allowedToCommit=false", self.isReconfigEnabled())); allowedToCommit = false; @@ -1424,13 +1424,13 @@ public class Leader extends LearnerMaster { connectingFollowers.add(sid); } QuorumVerifier verifier = self.getQuorumVerifier(); - if (connectingFollowers.contains(self.getId()) && verifier.containsQuorum(connectingFollowers)) { + if (connectingFollowers.contains(self.getMyId()) && verifier.containsQuorum(connectingFollowers)) { waitingForNewEpoch = false; self.setAcceptedEpoch(epoch); connectingFollowers.notifyAll(); } else { long start = Time.currentElapsedTime(); - if (sid == self.getId()) { + if (sid == self.getMyId()) { timeStartWaitForEpoch = start; } long cur = start; @@ -1476,7 +1476,7 @@ public class Leader extends LearnerMaster { } } QuorumVerifier verifier = self.getQuorumVerifier(); - if (electingFollowers.contains(self.getId()) && verifier.containsQuorum(electingFollowers)) { + if (electingFollowers.contains(self.getMyId()) && verifier.containsQuorum(electingFollowers)) { electionFinished = true; electingFollowers.notifyAll(); } else { @@ -1533,7 +1533,7 @@ public class Leader extends LearnerMaster { Long designatedLeader = getDesignatedLeader(newLeaderProposal, zk.getZxid()); self.processReconfig(newQV, designatedLeader, zk.getZxid(), true); - if (designatedLeader != self.getId()) { + if (designatedLeader != self.getMyId()) { LOG.warn("This leader is not the designated leader, it will be initialized with allowedToCommit = false"); allowedToCommit = false; } diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java index 5a51bc23d..2de080bd3 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java @@ -175,7 +175,7 @@ public class LeaderZooKeeperServer extends QuorumZooKeeperServer { this, getZKDatabase().getSessionWithTimeOuts(), tickTime, - self.getId(), + self.getMyId(), self.areLocalSessionsEnabled(), getZooKeeperServerListener()); } @@ -291,7 +291,7 @@ public class LeaderZooKeeperServer extends QuorumZooKeeperServer { */ @Override public long getServerId() { - return self.getId(); + return self.getMyId(); } @Override diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java index 1818bf9bb..0ed3b1ebe 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java @@ -491,7 +491,7 @@ public class Learner { /* * Add sid to payload */ - LearnerInfo li = new LearnerInfo(self.getId(), 0x10000, self.getQuorumVerifier().getVersion()); + LearnerInfo li = new LearnerInfo(self.getMyId(), 0x10000, self.getQuorumVerifier().getVersion()); ByteArrayOutputStream bsid = new ByteArrayOutputStream(); BinaryOutputArchive boa = BinaryOutputArchive.getArchive(bsid); boa.writeRecord(li, "LearnerInfo"); diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java index cab95b056..efd2e3762 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java @@ -71,7 +71,7 @@ public abstract class LearnerZooKeeperServer extends QuorumZooKeeperServer { */ @Override public long getServerId() { - return self.getId(); + return self.getMyId(); } @Override @@ -80,7 +80,7 @@ public abstract class LearnerZooKeeperServer extends QuorumZooKeeperServer { this, getZKDatabase().getSessionWithTimeOuts(), this.tickTime, - self.getId(), + self.getMyId(), self.areLocalSessionsEnabled(), getZooKeeperServerListener()); } diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LocalPeerBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LocalPeerBean.java index f5d0dbeda..f1649ff93 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LocalPeerBean.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LocalPeerBean.java @@ -35,7 +35,7 @@ public class LocalPeerBean extends ServerBean implements LocalPeerMXBean { } public String getName() { - return "replica." + peer.getId(); + return "replica." + peer.getMyId(); } public boolean isHidden() { @@ -119,12 +119,12 @@ public class LocalPeerBean extends ServerBean implements LocalPeerMXBean { @Override public boolean isPartOfEnsemble() { - return peer.getView().containsKey(peer.getId()); + return peer.getView().containsKey(peer.getMyId()); } @Override public boolean isLeader() { - return peer.isLeader(peer.getId()); + return peer.isLeader(peer.getMyId()); } @Override diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumBean.java index aae4552f4..46db6865b 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumBean.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumBean.java @@ -28,7 +28,7 @@ public class QuorumBean implements QuorumMXBean, ZKMBeanInfo { public QuorumBean(QuorumPeer peer) { this.peer = peer; - name = "ReplicatedServer_id" + peer.getId(); + name = "ReplicatedServer_id" + peer.getMyId(); } @Override diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java index 9d9f8bd86..eb5346af4 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java @@ -466,7 +466,7 @@ public class QuorumCnxManager { private boolean startConnection(Socket sock, Long sid) throws IOException { DataOutputStream dout = null; DataInputStream din = null; - LOG.debug("startConnection (myId:{} --> sid:{})", self.getId(), sid); + LOG.debug("startConnection (myId:{} --> sid:{})", self.getMyId(), sid); try { // Use BufferedOutputStream to reduce the number of IP packets. This is // important for x-DC scenarios. @@ -481,7 +481,7 @@ public class QuorumCnxManager { // understand the protocol version we use to avoid multiple partitions. see ZOOKEEPER-3720 long protocolVersion = self.isMultiAddressEnabled() ? PROTOCOL_VERSION_V2 : PROTOCOL_VERSION_V1; dout.writeLong(protocolVersion); - dout.writeLong(self.getId()); + dout.writeLong(self.getMyId()); // now we send our election address. For the new protocol version, we can send multiple addresses. Collection addressesToSend = protocolVersion == PROTOCOL_VERSION_V2 @@ -510,12 +510,12 @@ public class QuorumCnxManager { } // If lost the challenge, then drop the new connection - if (sid > self.getId()) { - LOG.info("Have smaller server identifier, so dropping the connection: (myId:{} --> sid:{})", self.getId(), sid); + if (sid > self.getMyId()) { + LOG.info("Have smaller server identifier, so dropping the connection: (myId:{} --> sid:{})", self.getMyId(), sid); closeSocket(sock); // Otherwise proceed with the connection } else { - LOG.debug("Have larger server identifier, so keeping the connection: (myId:{} --> sid:{})", self.getId(), sid); + LOG.debug("Have larger server identifier, so keeping the connection: (myId:{} --> sid:{})", self.getMyId(), sid); SendWorker sw = new SendWorker(sock, sid); RecvWorker rw = new RecvWorker(sock, din, sid, sw); sw.setRecv(rw); @@ -610,7 +610,7 @@ public class QuorumCnxManager { electionAddr = new MultipleAddresses(init.electionAddr, Duration.ofMillis(self.getMultiAddressReachabilityCheckTimeoutMs())); } - LOG.debug("Initial message parsed by {}: {}", self.getId(), init.toString()); + LOG.debug("Initial message parsed by {}: {}", self.getMyId(), init.toString()); } catch (InitialMessage.InitialMessageException ex) { LOG.error("Initial message parsing error!", ex); closeSocket(sock); @@ -635,7 +635,7 @@ public class QuorumCnxManager { // do authenticating learner authServer.authenticate(sock, din); //If wins the challenge, then close the new connection. - if (sid < self.getId()) { + if (sid < self.getMyId()) { /* * This replica might still believe that the connection to sid is * up, so we have to shut down the workers before trying to open a @@ -658,7 +658,7 @@ public class QuorumCnxManager { connectOne(sid); } - } else if (sid == self.getId()) { + } else if (sid == self.getMyId()) { // we saw this case in ZOOKEEPER-2164 LOG.warn("We got a connection request from a server with our own ID. " + "This should be either a configuration error, or a bug."); @@ -760,7 +760,7 @@ public class QuorumCnxManager { Map lastProposedView = lastSeenQV.getAllMembers(); if (lastCommittedView.containsKey(sid)) { knownId = true; - LOG.debug("Server {} knows {} already, it is in the lastCommittedView", self.getId(), sid); + LOG.debug("Server {} knows {} already, it is in the lastCommittedView", self.getMyId(), sid); if (connectOne(sid, lastCommittedView.get(sid).electionAddr)) { return; } @@ -770,7 +770,7 @@ public class QuorumCnxManager { && (!knownId || !lastProposedView.get(sid).electionAddr.equals(lastCommittedView.get(sid).electionAddr))) { knownId = true; - LOG.debug("Server {} knows {} already, it is in the lastProposedView", self.getId(), sid); + LOG.debug("Server {} knows {} already, it is in the lastProposedView", self.getMyId(), sid); if (connectOne(sid, lastProposedView.get(sid).electionAddr)) { return; @@ -839,7 +839,7 @@ public class QuorumCnxManager { */ public void softHalt() { for (SendWorker sw : senderWorkerMap.values()) { - LOG.debug("Server {} is soft-halting sender towards: {}", self.getId(), sw); + LOG.debug("Server {} is soft-halting sender towards: {}", self.getMyId(), sw); sw.finish(); } } @@ -943,7 +943,7 @@ public class QuorumCnxManager { @Override public void run() { if (!shutdown) { - LOG.debug("Listener thread started, myId: {}", self.getId()); + LOG.debug("Listener thread started, myId: {}", self.getMyId()); Set addresses; if (self.getQuorumListenOnAllIPs()) { @@ -1297,7 +1297,7 @@ public class QuorumCnxManager { } this.finish(); - LOG.warn("Send worker leaving thread id {} my id = {}", sid, self.getId()); + LOG.warn("Send worker leaving thread id {} my id = {}", sid, self.getMyId()); } 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 220d813f4..e7ed9af63 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 @@ -628,7 +628,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider /** * get the id of this quorum peer. */ - public long getId() { + public long getMyId() { return myid; } @@ -990,7 +990,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider QuorumServer qs = qv.getAllMembers().get(id); if (qs != null) { qs.recreateSocketAddresses(); - if (id == getId()) { + if (id == getMyId()) { setAddrs(qs.addr, qs.electionAddr, qs.clientAddr); } } @@ -1418,7 +1418,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider MBeanRegistry.getInstance().register(jmxQuorumBean, null); for (QuorumServer s : getView().values()) { ZKMBeanInfo p; - if (getId() == s.id) { + if (getMyId() == s.id) { p = jmxLocalPeerBean = new LocalPeerBean(this); try { MBeanRegistry.getInstance().register(p, jmxQuorumBean); @@ -1586,7 +1586,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider return; } - if (getId() == getCurrentVote().getId()) { + if (getMyId() == getCurrentVote().getId()) { setPeerState(ServerState.LEADING); LOG.debug("PeerState set to LEADING"); } else if (getLearnerType() == LearnerType.PARTICIPANT) { @@ -1880,7 +1880,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider if (quorumVerifier != null && lastSeenQuorumVerifier != null) { Map committedView = quorumVerifier.getAllMembers(); for (Entry e : lastSeenQuorumVerifier.getAllMembers().entrySet()) { - if (e.getKey() != getId() && !committedView.containsKey(e.getKey())) { + if (e.getKey() != getMyId() && !committedView.containsKey(e.getKey())) { qcm.connectOne(e.getKey()); } } @@ -1941,7 +1941,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider // and then got the same config in UPTODATE message so its already known LOG.debug( "{} setQuorumVerifier called with known or old config {}. Current version: {}", - getId(), + getMyId(), qv.getVersion(), quorumVerifier.getVersion()); return quorumVerifier; @@ -1970,7 +1970,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider if (qv.getVersion() == lastSeenQuorumVerifier.getVersion()) { QuorumPeerConfig.deleteFile(getNextDynamicConfigFilename()); } - QuorumServer qs = qv.getAllMembers().get(getId()); + QuorumServer qs = qv.getAllMembers().get(getMyId()); if (qs != null) { setAddrs(qs.addr, qs.electionAddr, qs.clientAddr); } @@ -1984,7 +1984,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider } private boolean needEraseClientInfoFromStaticConfig() { - QuorumServer server = quorumVerifier.getAllMembers().get(getId()); + QuorumServer server = quorumVerifier.getAllMembers().get(getMyId()); return (server != null && server.clientAddr != null && !server.isClientAddrFromStatic); } @@ -2275,7 +2275,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider restartLeaderElection(prevQV, qv); } - QuorumServer myNewQS = newMembers.get(getId()); + QuorumServer myNewQS = newMembers.get(getMyId()); if (myNewQS != null && myNewQS.clientAddr != null && !myNewQS.clientAddr.equals(oldClientAddr)) { cnxnFactory.reconfigure(myNewQS.clientAddr); updateThreadName(); @@ -2315,7 +2315,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider Set joiningMembers = new HashSet(newMembers.keySet()); joiningMembers.removeAll(jmxRemotePeerBean.keySet()); - joiningMembers.remove(getId()); // remove self as it is local bean + joiningMembers.remove(getMyId()); // remove self as it is local bean for (Long id : joiningMembers) { QuorumServer qs = newMembers.get(id); RemotePeerBean rBean = new RemotePeerBean(this, qs); @@ -2428,7 +2428,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider private boolean updateLearnerType(QuorumVerifier newQV) { //check if I'm an observer in new config - if (newQV.getObservingMembers().containsKey(getId())) { + if (newQV.getObservingMembers().containsKey(getMyId())) { if (getLearnerType() != LearnerType.OBSERVER) { setLearnerType(LearnerType.OBSERVER); LOG.info("Becoming an observer"); @@ -2437,7 +2437,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider } else { return false; } - } else if (newQV.getVotingMembers().containsKey(getId())) { + } else if (newQV.getVotingMembers().containsKey(getMyId())) { if (getLearnerType() != LearnerType.PARTICIPANT) { setLearnerType(LearnerType.PARTICIPANT); LOG.info("Becoming a voting participant"); @@ -2521,7 +2521,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider : "disabled" : "disabled"; String secure = secureCnxnFactory != null ? formatInetAddr(secureCnxnFactory.getLocalAddress()) : "disabled"; - setName(String.format("QuorumPeer[myid=%d](plain=%s)(secure=%s)", getId(), plain, secure)); + setName(String.format("QuorumPeer[myid=%d](plain=%s)(secure=%s)", getMyId(), plain, secure)); } /** @@ -2598,7 +2598,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider LOG.info("Using {}ms as the quorum cnxn socket timeout", timeout); return new QuorumCnxManager( this, - this.getId(), + this.getMyId(), this.getView(), this.authServer, this.authLearner, diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyZooKeeperServer.java index d2f6b39b6..0efa46770 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyZooKeeperServer.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyZooKeeperServer.java @@ -88,7 +88,7 @@ public class ReadOnlyZooKeeperServer extends ZooKeeperServer { public void createSessionTracker() { sessionTracker = new LearnerSessionTracker( this, getZKDatabase().getSessionWithTimeOuts(), - this.tickTime, self.getId(), self.areLocalSessionsEnabled(), + this.tickTime, self.getMyId(), self.areLocalSessionsEnabled(), getZooKeeperServerListener()); } @@ -186,7 +186,7 @@ public class ReadOnlyZooKeeperServer extends ZooKeeperServer { */ @Override public long getServerId() { - return self.getId(); + return self.getMyId(); } @Override diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/PrepRequestProcessorTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/PrepRequestProcessorTest.java index d80c5e08e..689b8eda9 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/PrepRequestProcessorTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/PrepRequestProcessorTest.java @@ -182,7 +182,7 @@ public class PrepRequestProcessorTest extends ClientBase { QuorumPeer qp = new QuorumPeer(); QuorumVerifier quorumVerifierMock = mock(QuorumVerifier.class); - when(quorumVerifierMock.getAllMembers()).thenReturn(LeaderBeanTest.getMockedPeerViews(qp.getId())); + when(quorumVerifierMock.getAllMembers()).thenReturn(LeaderBeanTest.getMockedPeerViews(qp.getMyId())); qp.setQuorumVerifier(quorumVerifierMock, false); FileTxnSnapLog snapLog = new FileTxnSnapLog(tmpDir, tmpDir); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CnxManagerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CnxManagerTest.java index e8b19dced..ad43d8826 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CnxManagerTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CnxManagerTest.java @@ -251,7 +251,7 @@ public class CnxManagerTest extends ZKTestCase { LOG.error("Null listener when initializing cnx manager"); } - InetSocketAddress address = peers.get(peer.getId()).electionAddr.getReachableOrOne(); + InetSocketAddress address = peers.get(peer.getMyId()).electionAddr.getReachableOrOne(); LOG.info("Election port: {}", address.getPort()); Thread.sleep(1000); @@ -339,7 +339,7 @@ public class CnxManagerTest extends ZKTestCase { } else { LOG.error("Null listener when initializing cnx manager"); } - InetSocketAddress address = peers.get(peer.getId()).electionAddr.getReachableOrOne(); + InetSocketAddress address = peers.get(peer.getMyId()).electionAddr.getReachableOrOne(); LOG.info("Election port: {}", address.getPort()); Thread.sleep(1000); @@ -386,7 +386,7 @@ public class CnxManagerTest extends ZKTestCase { } else { LOG.error("Null listener when initializing cnx manager"); } - InetSocketAddress address = peers.get(peer.getId()).electionAddr.getReachableOrOne(); + InetSocketAddress address = peers.get(peer.getMyId()).electionAddr.getReachableOrOne(); LOG.info("Election port: {}", address.getPort()); Thread.sleep(1000); @@ -503,7 +503,7 @@ public class CnxManagerTest extends ZKTestCase { try { for (int sid = 0; sid < 3; sid++) { QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[sid], peerTmpdir[sid], peerClientPort[sid], 3, sid, 1000, 2, 2, 2); - LOG.info("Starting peer {}", peer.getId()); + LOG.info("Starting peer {}", peer.getMyId()); peer.start(); peerList.add(sid, peer); } @@ -513,14 +513,14 @@ public class CnxManagerTest extends ZKTestCase { for (int i = 0; i < 5; i++) { // halt one of the listeners and verify count QuorumPeer peer = peerList.get(myid); - LOG.info("Round {}, halting peer {}", i, peer.getId()); + LOG.info("Round {}, halting peer {}", i, peer.getMyId()); peer.shutdown(); peerList.remove(myid); failure = verifyThreadCount(peerList, 2); assertNull(failure, failure); // Restart halted node and verify count peer = new QuorumPeer(peers, peerTmpdir[myid], peerTmpdir[myid], peerClientPort[myid], 3, myid, 1000, 2, 2, 2); - LOG.info("Round {}, restarting peer {}", i, peer.getId()); + LOG.info("Round {}, restarting peer {}", i, peer.getMyId()); peer.start(); peerList.add(myid, peer); failure = verifyThreadCount(peerList, 4); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FuzzySnapshotRelatedTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FuzzySnapshotRelatedTest.java index 3dcaf5de1..c39bc54e0 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FuzzySnapshotRelatedTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FuzzySnapshotRelatedTest.java @@ -533,7 +533,7 @@ public class FuzzySnapshotRelatedTest extends QuorumPeerTestBase { this, getZKDatabase().getSessionWithTimeOuts(), this.tickTime, - self.getId(), + self.getMyId(), self.areLocalSessionsEnabled(), getZooKeeperServerListener()) { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderBeanTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderBeanTest.java index 618ffa04f..dc537abbd 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderBeanTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderBeanTest.java @@ -76,7 +76,7 @@ public class LeaderBeanTest { public void setUp() throws IOException, X509Exception { qp = new QuorumPeer(); quorumVerifierMock = mock(QuorumVerifier.class); - when(quorumVerifierMock.getAllMembers()).thenReturn(getMockedPeerViews(qp.getId())); + when(quorumVerifierMock.getAllMembers()).thenReturn(getMockedPeerViews(qp.getMyId())); qp.setQuorumVerifier(quorumVerifierMock, false); File tmpDir = ClientBase.createEmptyTestDir(); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderWithObserverTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderWithObserverTest.java index f5df549c5..7ac563698 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderWithObserverTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderWithObserverTest.java @@ -73,7 +73,7 @@ public class LeaderWithObserverTest { try { // Leader asks for epoch (mocking Leader.lead behavior) // First add to connectingFollowers - leader.getEpochToPropose(peer.getId(), lastAcceptedEpoch); + leader.getEpochToPropose(peer.getMyId(), lastAcceptedEpoch); } catch (InterruptedException e) { // ignore timeout } @@ -113,7 +113,7 @@ public class LeaderWithObserverTest { assertFalse(leader.electionFinished); try { // leader calls waitForEpochAck, first add to electingFollowers - leader.waitForEpochAck(peer.getId(), new StateSummary(0, 0)); + leader.waitForEpochAck(peer.getMyId(), new StateSummary(0, 0)); } catch (InterruptedException e) { // ignore timeout } @@ -152,7 +152,7 @@ public class LeaderWithObserverTest { assertFalse(leader.quorumFormed); try { // leader calls waitForNewLeaderAck, first add to ackSet - leader.waitForNewLeaderAck(peer.getId(), zxid); + leader.waitForNewLeaderAck(peer.getMyId(), zxid); } catch (InterruptedException e) { // ignore timeout } diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LocalPeerBeanTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LocalPeerBeanTest.java index 6ff491a6a..74d437073 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LocalPeerBeanTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LocalPeerBeanTest.java @@ -85,7 +85,7 @@ public class LocalPeerBeanTest { public void testLocalPeerIsLeader() throws Exception { long localPeerId = 7; QuorumPeer peer = mock(QuorumPeer.class); - when(peer.getId()).thenReturn(localPeerId); + when(peer.getMyId()).thenReturn(localPeerId); when(peer.isLeader(eq(localPeerId))).thenReturn(true); LocalPeerBean localPeerBean = new LocalPeerBean(peer); assertTrue(localPeerBean.isLeader()); @@ -95,7 +95,7 @@ public class LocalPeerBeanTest { public void testLocalPeerIsNotLeader() throws Exception { long localPeerId = 7; QuorumPeer peer = mock(QuorumPeer.class); - when(peer.getId()).thenReturn(localPeerId); + when(peer.getMyId()).thenReturn(localPeerId); when(peer.isLeader(eq(localPeerId))).thenReturn(false); LocalPeerBean localPeerBean = new LocalPeerBean(peer); assertFalse(localPeerBean.isLeader()); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumBeanTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumBeanTest.java index 67bb673f1..62847461d 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumBeanTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumBeanTest.java @@ -29,7 +29,7 @@ public class QuorumBeanTest { @Test public void testGetNameProperty() { QuorumPeer qpMock = mock(QuorumPeer.class); - when(qpMock.getId()).thenReturn(1L); + when(qpMock.getMyId()).thenReturn(1L); QuorumBean qb = new QuorumBean(qpMock); assertThat("getName property should return Bean name in the right format", qb.getName(), equalTo("ReplicatedServer_id1")); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/Zab1_0Test.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/Zab1_0Test.java index 3bdbcd908..107ae6a72 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/Zab1_0Test.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/Zab1_0Test.java @@ -162,7 +162,7 @@ public class Zab1_0Test extends ZKTestCase { // epoch were accounted for, so the leader should not block and since it started with // accepted epoch = 5 it should now have 6 try { - long epoch = leader.getEpochToPropose(leader.self.getId(), leader.self.getAcceptedEpoch()); + long epoch = leader.getEpochToPropose(leader.self.getMyId(), leader.self.getAcceptedEpoch()); assertEquals(6, epoch, "leader got wrong epoch from getEpochToPropose"); } catch (Exception e) { fail("leader timed out in getEpochToPropose"); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLETest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLETest.java index 15713e423..0f679b2d2 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLETest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLETest.java @@ -368,7 +368,7 @@ public class FLETest extends ZKTestCase { this.peer = peer; } public void run() { - setName("VerifyState-" + peer.getId()); + setName("VerifyState-" + peer.getMyId()); while (true) { if (peer.getPeerState() == ServerState.FOLLOWING) { LOG.info("I am following"); @@ -410,7 +410,7 @@ public class FLETest extends ZKTestCase { // start 2 peers and verify if they form the cluster for (sid = 0; sid < 2; sid++) { peer = new QuorumPeer(peers, tmpdir[sid], tmpdir[sid], port[sid], 3, sid, 2000, 2, 2, 2); - LOG.info("Starting peer {}", peer.getId()); + LOG.info("Starting peer {}", peer.getMyId()); peer.start(); peerList.add(sid, peer); } @@ -421,16 +421,16 @@ public class FLETest extends ZKTestCase { assertFalse(!v1.isSuccess(), "Unable to form cluster in " + waitTime + " ms"); // Start 3rd peer and check if it goes in LEADING state peer = new QuorumPeer(peers, tmpdir[sid], tmpdir[sid], port[sid], 3, sid, 2000, 2, 2, 2); - LOG.info("Starting peer {}", peer.getId()); + LOG.info("Starting peer {}", peer.getMyId()); peer.start(); peerList.add(sid, peer); v1 = new VerifyState(peer); v1.start(); v1.join(waitTime); if (v1.isAlive()) { - fail("Peer " + peer.getId() + " failed to join the cluster " + "within " + waitTime + " ms"); + fail("Peer " + peer.getMyId() + " failed to join the cluster " + "within " + waitTime + " ms"); } else if (!v1.isSuccess()) { - fail("Incorrect LEADING state for peer " + peer.getId()); + fail("Incorrect LEADING state for peer " + peer.getMyId()); } // cleanup for (int id = 0; id < 3; id++) { @@ -459,7 +459,7 @@ public class FLETest extends ZKTestCase { // start 2 peers and verify if they form the cluster for (sid = 0; sid < 2; sid++) { peer = new QuorumPeer(peers, tmpdir[sid], tmpdir[sid], port[sid], 3, sid, 2000, 2, 2, 2); - LOG.info("Starting peer {}", peer.getId()); + LOG.info("Starting peer {}", peer.getMyId()); peer.start(); peerList.add(sid, peer); } @@ -478,14 +478,14 @@ public class FLETest extends ZKTestCase { peer.setCurrentVote(newVote); // Start 3rd peer and check if it joins the quorum peer = new QuorumPeer(peers, tmpdir[2], tmpdir[2], port[2], 3, 2, 2000, 2, 2, 2); - LOG.info("Starting peer {}", peer.getId()); + LOG.info("Starting peer {}", peer.getMyId()); peer.start(); peerList.add(sid, peer); v1 = new VerifyState(peer); v1.start(); v1.join(waitTime); if (v1.isAlive()) { - fail("Peer " + peer.getId() + " failed to join the cluster " + "within " + waitTime + " ms"); + fail("Peer " + peer.getMyId() + " failed to join the cluster " + "within " + waitTime + " ms"); } // cleanup for (int id = 0; id < 3; id++) { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java index 0fdac4556..59ed266f6 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java @@ -128,7 +128,7 @@ public class FLEZeroWeightTest extends ZKTestCase { LOG.info("Finished election: {}, {}", i, v.getId()); votes[i] = v; - if ((peer.getPeerState() == ServerState.LEADING) && (peer.getId() > 2)) { + if ((peer.getPeerState() == ServerState.LEADING) && (peer.getMyId() > 2)) { fail = true; } diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverMasterTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverMasterTest.java index ab30a1de0..683495407 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverMasterTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverMasterTest.java @@ -330,7 +330,7 @@ public class ObserverMasterTest extends ObserverMasterTestBase { ObjectName connBean = null; for (ObjectName bean : JMXEnv.conn().queryNames(new ObjectName(MBeanRegistry.DOMAIN + ":*"), null)) { if (bean.getCanonicalName().contains("Learner_Connections") && bean.getCanonicalName().contains("id:" - + q3.getQuorumPeer().getId())) { + + q3.getQuorumPeer().getMyId())) { connBean = bean; break; } @@ -344,7 +344,7 @@ public class ObserverMasterTest extends ObserverMasterTestBase { assertTrue(ClientBase.waitForServerUp("127.0.0.1:" + CLIENT_PORT_OBS, CONNECTION_TIMEOUT), "waiting for server 3 being up"); - final String obsBeanName = String.format("org.apache.ZooKeeperService:name0=ReplicatedServer_id%d,name1=replica.%d,name2=Observer", q3.getQuorumPeer().getId(), q3.getQuorumPeer().getId()); + final String obsBeanName = String.format("org.apache.ZooKeeperService:name0=ReplicatedServer_id%d,name1=replica.%d,name2=Observer", q3.getQuorumPeer().getMyId(), q3.getQuorumPeer().getMyId()); Set names = JMXEnv.conn().queryNames(new ObjectName(obsBeanName), null); assertEquals(1, names.size(), "expecting singular observer bean"); ObjectName obsBean = names.iterator().next(); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumTest.java index 760d9a4d7..72a5f140b 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumTest.java @@ -115,10 +115,10 @@ public class QuorumTest extends ZKTestCase { @Test public void testViewContains() { // Test view contains self - assertTrue(qb.s1.viewContains(qb.s1.getId())); + assertTrue(qb.s1.viewContains(qb.s1.getMyId())); // Test view contains other servers - assertTrue(qb.s1.viewContains(qb.s2.getId())); + assertTrue(qb.s1.viewContains(qb.s2.getMyId())); // Test view does not contain non-existant servers assertFalse(qb.s1.viewContains(-1L)); -- cgit v1.2.1