set tidb_log_bin after bootstrap

pingcap · Mar 11, 2019 · 27d17e6 · 27d17e6
1 parent 5eeb1b1
commit 27d17e6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/session/session.go b/session/session.go
@@ -1319,6 +1319,14 @@ func BootstrapSession(store kv.Storage) (*domain.Domain, error) {
 		return nil, errors.Trace(err)
 	}
 
+	// get global system tidb_log_bin from mysql.GLOBAL_VARIABLES
+	tidbLogBin, err := se1.GetGlobalSysVar(variable.TiDBLogBin)
+	if err != nil {
+		return nil, errors.Trace(err)
+	}
+	variable.SysVars[variable.TiDBLogBin].Value = tidbLogBin
+
+
 	if len(cfg.Plugin.Load) > 0 {
 		plugin.InitWatchLoops(dom.GetEtcdClient())
 	}

diff --git a/sessionctx/binloginfo/binloginfo.go b/sessionctx/binloginfo/binloginfo.go
@@ -97,7 +97,7 @@ func SetIgnoreError(on bool) {
 
 // ShouldEnableBinlog returns true if binlog.enable is "on", or binlog.enable is "auto" and tidb_log_bin's value is "1"
 func ShouldEnableBinlog() bool {
-	return config.GetGlobalConfig().Binlog.Enable == "on" || (config.GetGlobalConfig().Binlog.Enable == "auto" && variable.SysVars[variable.TiDBLogBin].Value == "1")
+	return config.GetGlobalConfig().Binlog.Enable == "on" || (config.GetGlobalConfig().Binlog.Enable == "auto" && variable.SysVars[variable.TiDBLogBin].Value=="1")
 }
 
 // WriteBinlog writes a binlog to Pump.

diff --git a/tidb-server/main.go b/tidb-server/main.go
@@ -146,9 +146,10 @@ func main() {
 	setupLog()
 	setupTracing() // Should before createServer and after setup config.
 	printInfo()
-	setupBinlogClient()
 	setupMetrics()
 	createStoreAndDomain()
+	// setupBinlogClient should run after bootstrap
+	setupBinlogClient()
 	createServer()
 	signal.SetupSignalHandler(serverShutdown)
 	runServer()