delete log_level in tiflash default conf

Signed-off-by: xufei <[email protected]>
pingcap · Jan 4, 2024 · 65c492b · 65c492b
1 parent 22f00af
commit 65c492b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/pkg/cluster/spec/tiflash.go b/pkg/cluster/spec/tiflash.go
@@ -538,10 +538,6 @@ func (i *TiFlashInstance) initTiFlashConfig(ctx context.Context, version string,
 		markCacheSize = `mark_cache_size: 5368709120`
 	}
 
-	logLevel := "debug"
-	if tidbver.TiFlashUseInfoLogAsDefault(version) {
-		logLevel = "info"
-	}
 	err = yaml.Unmarshal([]byte(fmt.Sprintf(`
 server_configs:
   tiflash:
@@ -564,7 +560,6 @@ server_configs:
     logger.errorlog: "%[2]s/tiflash_error.log"
     logger.log: "%[2]s/tiflash.log"
     logger.count: 20
-    logger.level: "%[15]s"
     logger.size: "1000M"
     %[13]s
     raft.pd_addr: "%[9]s"
@@ -586,7 +581,6 @@ server_configs:
 		deprecatedUsersConfig,
 		daemonConfig,
 		markCacheSize,
-		logLevel,
 	)), &topo)
 
 	if err != nil {

diff --git a/pkg/tidbver/tidbver.go b/pkg/tidbver/tidbver.go
@@ -56,11 +56,6 @@ func TiFlashSupportMultiDisksDeployment(version string) bool {
 	return semver.Compare(version, "v4.0.9") >= 0 || strings.Contains(version, "nightly")
 }
 
-// TiFlashUseInfoLogAsDefault return true if given version of TiFlash need use info log as the default log level
-func TiFlashUseInfoLogAsDefault(version string) bool {
-	return (semver.Compare(version, "v6.5.7") >= 0 && semver.Compare(version, "v6.6.0") < 0) || semver.Compare(version, "v7.1.0") >= 0 || strings.Contains(version, "nightly")
-}
-
 // TiFlashRequireCPUFlagAVX2 return if given version of TiFlash requires AVX2 CPU flags
 func TiFlashRequireCPUFlagAVX2(version string) bool {
 	// https://github.com/pingcap/tiup/pull/2054