From 327cc979c5f6b83167c5c1a93440ae6bbb35614d Mon Sep 17 00:00:00 2001 From: Hangjie Mo Date: Wed, 1 Sep 2021 18:01:53 +0800 Subject: [PATCH] config: update variable.Version equals to ServerVersion which set in the configuration file --- tidb-server/main.go | 1 + tidb-server/main_test.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/tidb-server/main.go b/tidb-server/main.go index e65ef97ad1ef3..47792434dd3c0 100644 --- a/tidb-server/main.go +++ b/tidb-server/main.go @@ -550,6 +550,7 @@ func setGlobalVars() { variable.SetSysVar(variable.Port, fmt.Sprintf("%d", cfg.Port)) variable.SetSysVar(variable.Socket, cfg.Socket) variable.SetSysVar(variable.DataDir, cfg.Path) + variable.SetSysVar(variable.Version, cfg.ServerVersion) variable.SetSysVar(variable.TiDBSlowQueryFile, cfg.Log.SlowQueryFile) variable.SetSysVar(variable.TiDBIsolationReadEngines, strings.Join(cfg.IsolationRead.Engines, ",")) variable.SetSysVar(variable.TiDBEnforceMPPExecution, variable.BoolToOnOff(config.GetGlobalConfig().Performance.EnforceMPP)) diff --git a/tidb-server/main_test.go b/tidb-server/main_test.go index 5ad6e1e32d004..2eae1fcae8d98 100644 --- a/tidb-server/main_test.go +++ b/tidb-server/main_test.go @@ -46,13 +46,16 @@ func TestRunMain(t *testing.T) { func TestSetGlobalVars(t *testing.T) { require.Equal(t, "tikv,tiflash,tidb", variable.GetSysVar(variable.TiDBIsolationReadEngines).Value) require.Equal(t, "1073741824", variable.GetSysVar(variable.TiDBMemQuotaQuery).Value) + require.NotEqual(t, "test", variable.GetSysVar(variable.Version).Value) config.UpdateGlobal(func(conf *config.Config) { conf.IsolationRead.Engines = []string{"tikv", "tidb"} conf.MemQuotaQuery = 9999999 + conf.ServerVersion = "test" }) setGlobalVars() require.Equal(t, "tikv,tidb", variable.GetSysVar(variable.TiDBIsolationReadEngines).Value) require.Equal(t, "9999999", variable.GetSysVar(variable.TiDBMemQuotaQuery).Value) + require.Equal(t, "test", variable.GetSysVar(variable.Version).Value) }