election: fix the data race of the leadership resetting (#4102)

* Fix the data race of the leadership resetting Signed-off-by: JmPotato <[email protected]> * Fix the test Signed-off-by: JmPotato <[email protected]> * Add a comment Signed-off-by: JmPotato <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]>
tikv · Sep 13, 2021 · 3f53f1e · 3f53f1e
1 parent 740fac1
commit 3f53f1e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/server/election/lease.go b/server/election/lease.go
@@ -22,6 +22,7 @@ import (
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
 	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/pkg/typeutil"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 )
@@ -71,7 +72,7 @@ func (l *lease) Close() error {
 		return nil
 	}
 	// Reset expire time.
-	l.expireTime.Store(time.Time{})
+	l.expireTime.Store(typeutil.ZeroTime)
 	// Try to revoke lease to make subsequent elections faster.
 	ctx, cancel := context.WithTimeout(l.client.Ctx(), revokeLeaseTimeout)
 	defer cancel()

diff --git a/server/tso/allocator_manager.go b/server/tso/allocator_manager.go
@@ -933,7 +933,10 @@ func (am *AllocatorManager) ResetAllocatorGroup(dcLocation string) {
 	defer am.mu.Unlock()
 	if allocatorGroup, exist := am.mu.allocatorGroups[dcLocation]; exist {
 		allocatorGroup.allocator.Reset()
-		allocatorGroup.leadership.Reset()
+		// Reset if it still has the leadership. Otherwise the data race may occur because of the re-campaigning.
+		if allocatorGroup.leadership.Check() {
+			allocatorGroup.leadership.Reset()
+		}
 	}
 }