planner: fix DATA RACE caused by TestCaptureWildcardFilter (#49092)

close #49088
pingcap · Dec 1, 2023 · a6046a0 · a6046a0
1 parent 3093057
commit a6046a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/bindinfo/capture.go b/pkg/bindinfo/capture.go
@@ -84,6 +84,8 @@ func ParseCaptureTableFilter(tableFilter string) (f tablefilter.Filter, valid bo
 }
 
 func (h *BindHandle) extractCaptureFilterFromStorage() (filter *captureFilter) {
+	h.sctx.Lock()
+	defer h.sctx.Unlock()
 	filter = &captureFilter{
 		frequency: 1,
 		users:     make(map[string]struct{}),

diff --git a/pkg/bindinfo/handle.go b/pkg/bindinfo/handle.go
@@ -43,7 +43,7 @@ import (
 
 // BindHandle is used to handle all global sql bind operations.
 type BindHandle struct {
-	sctx struct {
+	sctx struct { // TODO: remove this singleton sctx later on, which is not thread-safe.
 		sync.Mutex
 		sessionctx.Context
 	}