ahead resign

Signed-off-by: husharp <jinhao.hu@pingcap.com>
tikv · Jan 5, 2024 · ceb0c7c · ceb0c7c
1 parent 34cb477
commit ceb0c7c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/member/member.go b/pkg/member/member.go
@@ -187,10 +187,10 @@ func (m *EmbeddedEtcdMember) CampaignLeader(ctx context.Context, leaseTimeout in
 	})
 
 	if m.leadership.GetCampaignTimesNum() >= campaignLeaderFrequencyTimes {
-		m.leadership.ResetCampaignTimes()
 		if err := m.ResignEtcdLeader(ctx, m.Name(), ""); err != nil {
 			return err
 		}
+		m.leadership.ResetCampaignTimes()
 		return errs.ErrLeaderFrequentlyChange.FastGenByArgs(m.Name(), m.GetLeaderPath())
 	}
 

diff --git a/server/server.go b/server/server.go
@@ -1784,11 +1784,12 @@ func (s *Server) campaignLeader() {
 				return
 			}
 			// check healthy status of etcd leader.
-			if s.member.GetLeadership().GetUnHealthyTimesNum() > unhealthyLeaderLeaseTimes {
-				s.member.GetLeadership().ResetUnHealthyTimesNum(ctx)
+			if s.member.GetLeadership().GetUnHealthyTimesNum() >= unhealthyLeaderLeaseTimes {
 				if err := s.member.ResignEtcdLeader(ctx, s.member.Name(), ""); err != nil {
 					return
 				}
+				s.member.GetLeadership().ResetUnHealthyTimesNum(ctx)
+				return
 			}
 		case <-ctx.Done():
 			// Server is closed and it should return nil.