config: change enable-slow-log to boolean (pingcap#14864)

gaoyuqi · Feb 20, 2020 · 6b09729 · 6b09729
1 parent 3cd5fb6
commit 6b09729
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/config/config.go b/config/config.go
@@ -205,11 +205,11 @@ type Log struct {
 	// File log config.
 	File logutil.FileLogConfig `toml:"file" json:"file"`
 
+	EnableSlowLog       bool   `toml:"enable-slow-log" json:"enable-slow-log"`
 	SlowQueryFile       string `toml:"slow-query-file" json:"slow-query-file"`
 	SlowThreshold       uint64 `toml:"slow-threshold" json:"slow-threshold"`
 	ExpensiveThreshold  uint   `toml:"expensive-threshold" json:"expensive-threshold"`
 	QueryLogMaxLen      uint64 `toml:"query-log-max-len" json:"query-log-max-len"`
-	EnableSlowLog       uint32 `toml:"enable-slow-log" json:"enable-slow-log"`
 	RecordPlanInSlowLog uint32 `toml:"record-plan-in-slow-log" json:"record-plan-in-slow-log"`
 }
 

diff --git a/config/config.toml.example b/config/config.toml.example
@@ -110,6 +110,9 @@ format = "text"
 # Enable annotating logs with the full stack error message, if not set, it will be defaulted to false.
 # enable-error-stack = false
 
+# Whether to enable slow query log.
+enable-slow-log = true
+
 # Stores slow query log into separated files.
 slow-query-file = "tidb-slow.log"
 

diff --git a/executor/adapter.go b/executor/adapter.go
@@ -776,8 +776,8 @@ func (a *ExecStmt) LogSlowQuery(txnTS uint64, succ bool, hasMoreResults bool) {
 	level := log.GetLevel()
 	cfg := config.GetGlobalConfig()
 	costTime := time.Since(sessVars.StartTime) + sessVars.DurationParse
-	threshold := time.Duration(atomic.LoadUint64(&cfg.Log.SlowThreshold)) * time.Millisecond
-	enable := atomic.LoadUint32(&cfg.Log.EnableSlowLog) > 0
+	threshold := time.Duration(cfg.Log.SlowThreshold) * time.Millisecond
+	enable := cfg.Log.EnableSlowLog
 	// if the level is Debug, print slow logs anyway
 	if (!enable || costTime < threshold) && level > zapcore.DebugLevel {
 		return

diff --git a/util/logutil/log.go b/util/logutil/log.go
@@ -48,7 +48,7 @@ const (
 	// DefaultRecordPlanInSlowLog is the default value for whether enable log query plan in the slow log.
 	DefaultRecordPlanInSlowLog = 1
 	// DefaultTiDBEnableSlowLog enables TiDB to log slow queries.
-	DefaultTiDBEnableSlowLog = 1
+	DefaultTiDBEnableSlowLog = true
 )
 
 // EmptyFileLogConfig is an empty FileLogConfig.