fix DATA RACE

pingcap · Feb 17, 2020 · 8b199eb · 8b199eb
1 parent bad915b
commit 8b199eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/config/config.go b/config/config.go
@@ -839,7 +839,8 @@ func (t *OpenTracing) ToTracingConfig() *tracing.Configuration {
 
 func init() {
 	conf := defaultConf
-	globalConfHandler = &constantConfHandler{&conf}
+	globalConfHandler = new(constantConfHandler)
+	globalConfHandler.SetConfig(&conf)
 	if checkBeforeDropLDFlag == "1" {
 		CheckTableBeforeDrop = true
 	}

diff --git a/config/config_handler.go b/config/config_handler.go
@@ -49,23 +49,25 @@ func NewConfHandler(localConf *Config, reloadFunc ConfReloadFunc,
 	if strings.ToLower(localConf.Store) == "tikv" && localConf.EnableDynamicConfig {
 		return newPDConfHandler(localConf, reloadFunc, newPDCliFunc)
 	}
-	return &constantConfHandler{localConf}, nil
+	cch := new(constantConfHandler)
+	cch.curConf.Store(localConf)
+	return cch, nil
 }
 
 // constantConfHandler is used when EnableDynamicConfig is false.
 // The conf in it will always be the configuration that initialized when TiDB is started.
 type constantConfHandler struct {
-	conf *Config
+	curConf atomic.Value
 }
 
 func (cch *constantConfHandler) Start() {}
 
 func (cch *constantConfHandler) Close() {}
 
-func (cch *constantConfHandler) GetConfig() *Config { return cch.conf }
+func (cch *constantConfHandler) GetConfig() *Config { return cch.curConf.Load().(*Config) }
 
 func (cch *constantConfHandler) SetConfig(conf *Config) error {
-	cch.conf = conf
+	cch.curConf.Store(conf)
 	return nil
 }