ignore old leader's leases revoking request

Signed-off-by: Benjamin Wang <[email protected]>

server/etcdserver/server.go

@@ -858,8 +858,20 @@ func (s *EtcdServer) run() {
 }
 
 func (s *EtcdServer) revokeExpiredLeases(leases []*lease.Lease) {
+	lg := s.Logger()
+	newLeaderId := s.raftStatus().Lead
+	// This can only mitigate the issue. This can't completely resolve
+	// https://github.com/etcd-io/etcd/issues/15247. Because the leases
+	// may be wrongly revoked by the new leader. Refer to the document in
+	// https://github.com/etcd-io/etcd/issues/15247#issuecomment-1777862093.
+	if newLeaderId != uint64(s.MemberId()) {
+		lg.Warn("Ignore old leader's leases revoking requests",
+			zap.Uint64("local-member-id", uint64(s.MemberId())),
+			zap.Uint64("new-lead", newLeaderId))
+		return
+	}
+
 	s.GoAttach(func() {
-		lg := s.Logger()
 		// Increases throughput of expired leases deletion process through parallelization
 		c := make(chan struct{}, maxPendingRevokes)
 		for _, curLease := range leases {