*: fix data race at the mockOwnerOpValue (#45107)

close #45106
pingcap · Jul 3, 2023 · ab63aeb · ab63aeb
1 parent b9671dc
commit ab63aeb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/owner/manager.go b/owner/manager.go
@@ -415,7 +415,7 @@ func (m *ownerManager) SetOwnerOpValue(ctx context.Context, op OpType) error {
 func GetOwnerOpValue(ctx context.Context, etcdCli *clientv3.Client, ownerPath, logPrefix string) (OpType, error) {
 	// It's using for testing.
 	if etcdCli == nil {
-		return mockOwnerOpValue, nil
+		return *mockOwnerOpValue.Load(), nil
 	}
 
 	logCtx := logutil.WithKeyValue(context.Background(), "owner info", logPrefix)

diff --git a/owner/mock.go b/owner/mock.go
@@ -17,6 +17,7 @@ package owner
 import (
 	"context"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/pingcap/errors"
@@ -105,10 +106,10 @@ func (m *mockManager) GetOwnerID(_ context.Context) (string, error) {
 	return "", errors.New("no owner")
 }
 
-var mockOwnerOpValue = OpNone
+var mockOwnerOpValue atomic.Pointer[OpType]
 
 func (*mockManager) SetOwnerOpValue(_ context.Context, op OpType) error {
-	mockOwnerOpValue = op
+	mockOwnerOpValue.Store(&op)
 	return nil
 }