variable: revise TiDBStatsCacheMemQuota settting code (#34762)

ref #34052
pingcap · May 18, 2022 · 95e359f · 95e359f
1 parent d40b5e1
commit 95e359f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/domain/domain.go b/domain/domain.go
@@ -742,6 +742,7 @@ func NewDomain(store kv.Storage, ddlLease time.Duration, statsLease time.Duratio
 	do.SchemaValidator = NewSchemaValidator(ddlLease, do)
 	do.expensiveQueryHandle = expensivequery.NewExpensiveQueryHandle(do.exit)
 	do.sysProcesses = SysProcesses{mu: &sync.RWMutex{}, procMap: make(map[uint64]sessionctx.Context)}
+	variable.SetStatsCacheCapacity = do.SetStatsCacheCapacity
 	return do
 }
 

diff --git a/domain/sysvar_cache.go b/domain/sysvar_cache.go
@@ -139,8 +139,6 @@ func (do *Domain) rebuildSysVarCache(ctx sessionctx.Context) error {
 		if sv.HasGlobalScope() {
 			newGlobalCache[sv.Name] = sVal
 
-			oldStatsCacheMemQuota := variable.StatsCacheMemQuota.Load()
-
 			// Call the SetGlobal func for this sysvar if it exists.
 			// SET GLOBAL only calls the SetGlobal func on the calling instances.
 			// This ensures it is run on all tidb servers.
@@ -151,11 +149,6 @@ func (do *Domain) rebuildSysVarCache(ctx sessionctx.Context) error {
 				if err != nil {
 					logutil.BgLogger().Error(fmt.Sprintf("load global variable %s error", sv.Name), zap.Error(err))
 				}
-
-				newStatsCacheMemQuota := variable.StatsCacheMemQuota.Load()
-				if sv.Name == variable.TiDBStatsCacheMemQuota && oldStatsCacheMemQuota != newStatsCacheMemQuota {
-					do.SetStatsCacheCapacity(newStatsCacheMemQuota)
-				}
 			}
 		}
 

diff --git a/sessionctx/variable/sysvar.go b/sessionctx/variable/sysvar.go
@@ -714,7 +714,11 @@ var defaultSysVars = []*SysVar{
 			return strconv.FormatInt(StatsCacheMemQuota.Load(), 10), nil
 		}, SetGlobal: func(vars *SessionVars, s string) error {
 			v := TidbOptInt64(s, DefTiDBStatsCacheMemQuota)
-			StatsCacheMemQuota.Store(v)
+			oldv := StatsCacheMemQuota.Load()
+			if v != oldv {
+				StatsCacheMemQuota.Store(v)
+				SetStatsCacheCapacity(v)
+			}
 			return nil
 		},
 	},

diff --git a/sessionctx/variable/tidb_vars.go b/sessionctx/variable/tidb_vars.go
@@ -914,4 +914,6 @@ var (
 	SetMemQuotaAnalyze func(quota int64) = nil
 	// GetMemQuotaAnalyze is the func registered by global/subglobal tracker to get memory quota.
 	GetMemQuotaAnalyze func() int64 = nil
+	// SetStatsCacheCapacity is the func registered by domain to set statsCache memory quota.
+	SetStatsCacheCapacity func(c int64) = nil
 )