From b8b628674a80d8436d0042e0beae312732bb6e9c Mon Sep 17 00:00:00 2001 From: Yu Shuaipeng Date: Mon, 18 Feb 2019 15:32:56 +0800 Subject: [PATCH 1/2] show tidb_force_priority should be same as config --- sessionctx/variable/sysvar.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sessionctx/variable/sysvar.go b/sessionctx/variable/sysvar.go index 9befa39267a1c..03e6f48898ca7 100644 --- a/sessionctx/variable/sysvar.go +++ b/sessionctx/variable/sysvar.go @@ -679,7 +679,7 @@ var defaultSysVars = []*SysVar{ {ScopeGlobal, TiDBDDLReorgWorkerCount, strconv.Itoa(DefTiDBDDLReorgWorkerCount)}, {ScopeGlobal, TiDBDDLReorgBatchSize, strconv.Itoa(DefTiDBDDLReorgBatchSize)}, {ScopeSession, TiDBDDLReorgPriority, "PRIORITY_LOW"}, - {ScopeSession, TiDBForcePriority, mysql.Priority2Str[DefTiDBForcePriority]}, + {ScopeSession, TiDBForcePriority, config.GetGlobalConfig().Performance.ForcePriority}, {ScopeSession, TiDBEnableRadixJoin, boolToIntStr(DefTiDBUseRadixJoin)}, } From ca9bcbc6f6daef78da23a111adcc72abfb95ec27 Mon Sep 17 00:00:00 2001 From: Yu Shuaipeng Date: Mon, 18 Feb 2019 16:49:02 +0800 Subject: [PATCH 2/2] address comments --- sessionctx/variable/sysvar.go | 2 +- tidb-server/main.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sessionctx/variable/sysvar.go b/sessionctx/variable/sysvar.go index 03e6f48898ca7..9befa39267a1c 100644 --- a/sessionctx/variable/sysvar.go +++ b/sessionctx/variable/sysvar.go @@ -679,7 +679,7 @@ var defaultSysVars = []*SysVar{ {ScopeGlobal, TiDBDDLReorgWorkerCount, strconv.Itoa(DefTiDBDDLReorgWorkerCount)}, {ScopeGlobal, TiDBDDLReorgBatchSize, strconv.Itoa(DefTiDBDDLReorgBatchSize)}, {ScopeSession, TiDBDDLReorgPriority, "PRIORITY_LOW"}, - {ScopeSession, TiDBForcePriority, config.GetGlobalConfig().Performance.ForcePriority}, + {ScopeSession, TiDBForcePriority, mysql.Priority2Str[DefTiDBForcePriority]}, {ScopeSession, TiDBEnableRadixJoin, boolToIntStr(DefTiDBUseRadixJoin)}, } diff --git a/tidb-server/main.go b/tidb-server/main.go index 279ed416b43dc..19212dab3c5f9 100644 --- a/tidb-server/main.go +++ b/tidb-server/main.go @@ -444,7 +444,10 @@ func setGlobalVars() { } plannercore.AllowCartesianProduct = cfg.Performance.CrossJoin privileges.SkipWithGrant = cfg.Security.SkipGrantTable - variable.ForcePriority = int32(mysql.Str2Priority(cfg.Performance.ForcePriority)) + + priority := mysql.Str2Priority(cfg.Performance.ForcePriority) + variable.ForcePriority = int32(priority) + variable.SysVars[variable.TiDBForcePriority].Value = mysql.Priority2Str[priority] variable.SysVars[variable.TIDBMemQuotaQuery].Value = strconv.FormatInt(cfg.MemQuotaQuery, 10) variable.SysVars["lower_case_table_names"].Value = strconv.Itoa(cfg.LowerCaseTableNames)