Merge branch 'master' into fix_push

pingcap · Aug 9, 2022 · 3db1d71 · 3db1d71
2 parents 7629203 + 25b38a0
commit 3db1d71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/cluster/manager/check.go b/pkg/cluster/manager/check.go
@@ -644,7 +644,7 @@ func fixFailedChecks(host string, res *operator.CheckResult, t *task.Builder) (s
 		msg = fmt.Sprintf("will try to %s, reboot might be needed", color.HiBlueString("disable SELinux"))
 	case operator.CheckNameTHP:
 		t.Shell(host,
-			fmt.Sprintf(`if [ -d %[1]s ]; then echo never > %[1]s/defrag && echo never > %[1]s/enabled; fi`, "/sys/kernel/mm/transparent_hugepage"),
+			fmt.Sprintf(`if [ -d %[1]s ]; then echo never > %[1]s/enabled; fi`, "/sys/kernel/mm/transparent_hugepage"),
 			"",
 			true)
 		msg = fmt.Sprintf("will try to %s, please check again after reboot", color.HiBlueString("disable THP"))

diff --git a/pkg/cluster/operation/check.go b/pkg/cluster/operation/check.go
@@ -820,14 +820,14 @@ func CheckFIOResult(rr, rw, lat []byte) []*CheckResult {
 	return results
 }
 
-// CheckTHP checks THP in /sys/kernel/mm/transparent_hugepage/{enabled,defrag}
+// CheckTHP checks THP in /sys/kernel/mm/transparent_hugepage/enabled
 func CheckTHP(ctx context.Context, e ctxt.Executor) *CheckResult {
 	result := &CheckResult{
 		Name: CheckNameTHP,
 	}
 
 	m := module.NewShellModule(module.ShellModuleConfig{
-		Command: fmt.Sprintf(`if [ -d %[1]s ]; then cat %[1]s/{enabled,defrag}; fi`, "/sys/kernel/mm/transparent_hugepage"),
+		Command: fmt.Sprintf(`if [ -d %[1]s ]; then cat %[1]s/enabled; fi`, "/sys/kernel/mm/transparent_hugepage"),
 		Sudo:    true,
 	})
 	stdout, stderr, err := m.Execute(ctx, e)