Merge branch 'master' into fmtver

pingcap · Dec 24, 2020 · afe2b12 · afe2b12
2 parents 27980a7 + 081877a
commit afe2b12
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/cluster/operation/check.go b/pkg/cluster/operation/check.go
@@ -669,7 +669,7 @@ func CheckTHP(e executor.Executor) *CheckResult {
 		return result
 	}
 
-	for _, line := range strings.Split(string(stdout), "\n") {
+	for _, line := range strings.Split(strings.Trim(string(stdout), "\n"), "\n") {
 		if !strings.Contains(line, "[never]") {
 			result.Err = fmt.Errorf("THP is enabled, please disable it for best performance")
 			return result