This is an automated email from the ASF dual-hosted git repository. szetszwo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ratis.git
commit 8fe94ff903b5fb14409b69598c88e477c81307b2 Author: Tsz-Wo Nicholas Sze <[email protected]> AuthorDate: Wed Nov 17 15:24:54 2021 +0800 Revert "Ratis-1435. Update metric of leaderElectionTimeout (#536)" for updating commit message. This reverts commit d98c7be27c0648d261955b83d2b375e6fd2ab9d1. --- .../main/java/org/apache/ratis/server/impl/LeaderStateImpl.java | 2 +- .../org/apache/ratis/server/metrics/LeaderElectionMetrics.java | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java index 0385011..ee3c012 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java @@ -559,7 +559,6 @@ class LeaderStateImpl implements LeaderState { final StartLeaderElectionRequestProto r = ServerProtoUtils.toStartLeaderElectionRequestProto( server.getMemberId(), follower, lastEntry); CompletableFuture.supplyAsync(() -> { - server.getLeaderElectionMetrics().onTransferLeadership(); try { StartLeaderElectionReplyProto replyProto = server.getServerRpc().startLeaderElection(r); LOG.info("{} received {} reply of StartLeaderElectionRequest from follower:{}", @@ -938,6 +937,7 @@ class LeaderStateImpl implements LeaderState { "is higher than leader's:{} and follower's lastEntry index:{} catch up with leader's:{}", this, followerID, currentTerm, followerPriority, leaderPriority, followerInfo.getMatchIndex(), leaderLastEntry.getIndex()); + sendStartLeaderElectionToHigherPriorityPeer(followerID, leaderLastEntry); return; } diff --git a/ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java b/ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java index ef4ca8d..665f59b 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/metrics/LeaderElectionMetrics.java @@ -41,9 +41,9 @@ public final class LeaderElectionMetrics extends RatisMetrics { public static final String LEADER_ELECTION_TIMEOUT_COUNT_METRIC = "timeoutCount"; public static final String LEADER_ELECTION_TIME_TAKEN = "electionTime"; public static final String LAST_LEADER_ELAPSED_TIME = "lastLeaderElapsedTime"; - public static final String TRANSFER_LEADERSHIP_COUNT_METRIC = "transferLeadershipCount"; - public static final String LAST_LEADER_ELECTION_ELAPSED_TIME = "lastLeaderElectionElapsedTime"; + public static final String LAST_LEADER_ELECTION_ELAPSED_TIME = + "lastLeaderElectionElapsedTime"; private volatile Timestamp lastElectionTime; private LeaderElectionMetrics(RaftGroupMemberId serverId, LongSupplier getLastLeaderElapsedTimeMs) { @@ -76,8 +76,4 @@ public final class LeaderElectionMetrics extends RatisMetrics { public void onLeaderElectionTimeout() { registry.counter(LEADER_ELECTION_TIMEOUT_COUNT_METRIC).inc(); } - - public void onTransferLeadership() { - registry.counter(TRANSFER_LEADERSHIP_COUNT_METRIC).inc(); - } }
