*: print log if fail to close lease (#9181)

ref #4399

Signed-off-by: Ryan Leung <[email protected]>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

Author: rleungx

client/errs/errno.go

@@ -26,8 +26,6 @@ const (
 	NoLeaderErr = "no leader"
 	// NotLeaderErr indicates the non-leader member received the requests which should be received by leader.
 	NotLeaderErr = "not leader"
-	// MismatchLeaderErr indicates the non-leader member received the requests which should be received by leader.
-	MismatchLeaderErr = "mismatch leader id"
 	// NotServedErr indicates an tso node/pod received the requests for the keyspace groups which are not served by it.
 	NotServedErr = "is not served"
 	// RetryTimeoutErr indicates the server is busy.

client/errs/errs.go

@@ -35,7 +35,6 @@ func IsLeaderChange(err error) bool {
 	errMsg := err.Error()
 	return strings.Contains(errMsg, NoLeaderErr) ||
 		strings.Contains(errMsg, NotLeaderErr) ||
-		strings.Contains(errMsg, MismatchLeaderErr) ||
 		strings.Contains(errMsg, NotServedErr) ||
 		strings.Contains(errMsg, NotPrimaryErr)
 }

client/servicediscovery/service_discovery.go

@@ -849,7 +849,7 @@ func (c *serviceDiscovery) initClusterID() error {
 func (c *serviceDiscovery) checkServiceModeChanged() error {
 	leaderURL := c.getLeaderURL()
 	if len(leaderURL) == 0 {
-		return errors.New("no leader found")
+		return errors.New(errs.NoLeaderErr)
 	}
 
 	clusterInfo, err := c.getClusterInfo(c.ctx, leaderURL, c.option.Timeout)

errors.toml

@@ -686,9 +686,9 @@ error = '''
 etcd leader not found
 '''
 
-["PD:member:ErrMarshalLeader"]
+["PD:member:ErrMarshalMember"]
 error = '''
-marshal leader failed
+marshal member failed
 '''
 
 ["PD:netstat:ErrNetstatTCPSocks"]

pkg/election/leadership.go

@@ -429,7 +429,10 @@ func (ls *Leadership) Reset() {
 		ls.keepAliveCancelFunc()
 	}
 	ls.keepAliveCancelFuncLock.Unlock()
-	ls.GetLease().Close()
+	err := ls.GetLease().Close()
+	if err != nil {
+		log.Error("close lease failed", zap.String("purpose", ls.purpose), errs.ZapError(err))
+	}
 	ls.SetPrimaryWatch(false)
 	ls.leaderValue.Store("")
 }

pkg/errs/errno.go

@@ -26,10 +26,6 @@ const (
 	// Note: keep the same as the ones defined on the client side, because the client side checks if an error message
 	// contains this string to judge whether the leader is changed.
 	NotLeaderErr = "is not leader"
-	// MismatchLeaderErr indicates the non-leader member received the requests which should be received by leader.
-	// Note: keep the same as the ones defined on the client side, because the client side checks if an error message
-	// contains this string to judge whether the leader is changed.
-	MismatchLeaderErr = "mismatch leader id"
 	// NotServedErr indicates an tso node/pod received the requests for the keyspace groups which are not served by it.
 	// Note: keep the same as the ones defined on the client side, because the client side checks if an error message
 	// contains this string to judge whether the leader is changed.
@@ -122,7 +118,7 @@ var (
 // member errors
 var (
 	ErrEtcdLeaderNotFound = errors.Normalize("etcd leader not found", errors.RFCCodeText("PD:member:ErrEtcdLeaderNotFound"))
-	ErrMarshalLeader      = errors.Normalize("marshal leader failed", errors.RFCCodeText("PD:member:ErrMarshalLeader"))
+	ErrMarshalMember      = errors.Normalize("marshal member failed", errors.RFCCodeText("PD:member:ErrMarshalMember"))
 	ErrCheckCampaign      = errors.Normalize("check campaign failed", errors.RFCCodeText("PD:member:ErrCheckCampaign"))
 )
 

pkg/member/member.go

@@ -330,19 +330,19 @@ func (m *EmbeddedEtcdMember) IsSameLeader(leader any) bool {
 
 // InitMemberInfo initializes the member info.
 func (m *EmbeddedEtcdMember) InitMemberInfo(advertiseClientUrls, advertisePeerUrls, name string) {
-	leader := &pdpb.Member{
+	member := &pdpb.Member{
 		Name:       name,
 		MemberId:   m.ID(),
 		ClientUrls: strings.Split(advertiseClientUrls, ","),
 		PeerUrls:   strings.Split(advertisePeerUrls, ","),
 	}
 
-	data, err := leader.Marshal()
+	data, err := member.Marshal()
 	if err != nil {
 		// can't fail, so panic here.
-		log.Fatal("marshal pd leader meet error", zap.Stringer("pd-leader", leader), errs.ZapError(errs.ErrMarshalLeader, err))
+		log.Fatal("marshal pd member meet error", zap.Stringer("pd-member", member), errs.ZapError(errs.ErrMarshalMember, err))
 	}
-	m.member = leader
+	m.member = member
 	m.memberValue = string(data)
 	m.leadership = election.NewLeadership(m.client, m.GetLeaderPath(), "leader election")
 	log.Info("member joining election", zap.Stringer("member-info", m.member))

pkg/member/participant.go

@@ -81,7 +81,7 @@ func (m *Participant) InitInfo(p participant, purpose string) {
 	data, err := p.Marshal()
 	if err != nil {
 		// can't fail, so panic here.
-		log.Fatal("marshal leader meet error", zap.String("member-name", p.String()), errs.ZapError(errs.ErrMarshalLeader, err))
+		log.Fatal("marshal member meet error", zap.String("member-name", p.String()), errs.ZapError(errs.ErrMarshalMember, err))
 	}
 	m.member = p
 	m.memberValue = string(data)