Merge 244b96b into 5ef4728

pingcap · Aug 12, 2021 · c8a1e70 · c8a1e70
2 parents 5ef4728 + 244b96b
commit c8a1e70
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/components/playground/main.go b/components/playground/main.go
@@ -74,8 +74,8 @@ var (
 )
 
 const (
-	mode        = "mode"
-	withMonitor = "monitor"
+	mode           = "mode"
+	withMonitor    = "monitor"
 	withoutMonitor = "without-monitor"
 
 	// instance numbers

diff --git a/pkg/cluster/executor/local.go b/pkg/cluster/executor/local.go
@@ -43,9 +43,9 @@ var _ ctxt.Executor = &Local{}
 func (l *Local) Execute(ctx context.Context, cmd string, sudo bool, timeout ...time.Duration) ([]byte, []byte, error) {
 	// try to acquire root permission
 	if l.Sudo || sudo {
-		cmd = fmt.Sprintf("sudo -H -u root bash -c 'cd; %s'", cmd)
+		cmd = fmt.Sprintf("/usr/bin/sudo -H -u root bash -c 'cd; %s'", cmd)
 	} else {
-		cmd = fmt.Sprintf("sudo -H -u %s bash -c 'cd; %s'", l.Config.User, cmd)
+		cmd = fmt.Sprintf("/usr/bin/sudo -H -u %s bash -c 'cd; %s'", l.Config.User, cmd)
 	}
 
 	// set a basic PATH in case it's empty on login
@@ -114,7 +114,7 @@ func (l *Local) Transfer(ctx context.Context, src, dst string, download bool, li
 	if download || user.Username == l.Config.User {
 		cmd = fmt.Sprintf("cp %s %s", src, dst)
 	} else {
-		cmd = fmt.Sprintf("sudo -H -u root bash -c \"cp %[1]s %[2]s && chown %[3]s:$(id -g -n %[3]s) %[2]s\"", src, dst, l.Config.User)
+		cmd = fmt.Sprintf("/usr/bin/sudo -H -u root bash -c \"cp %[1]s %[2]s && chown %[3]s:$(id -g -n %[3]s) %[2]s\"", src, dst, l.Config.User)
 	}
 
 	command := exec.Command("/bin/sh", "-c", cmd)

diff --git a/pkg/cluster/executor/ssh.go b/pkg/cluster/executor/ssh.go
@@ -139,7 +139,7 @@ func (e *EasySSHExecutor) initialize(config SSHConfig) {
 func (e *EasySSHExecutor) Execute(ctx context.Context, cmd string, sudo bool, timeout ...time.Duration) ([]byte, []byte, error) {
 	// try to acquire root permission
 	if e.Sudo || sudo {
-		cmd = fmt.Sprintf("sudo -H bash -c \"%s\"", cmd)
+		cmd = fmt.Sprintf("/usr/bin/sudo -H bash -c \"%s\"", cmd)
 	}
 
 	// set a basic PATH in case it's empty on login
@@ -276,7 +276,7 @@ func (e *NativeSSHExecutor) Execute(ctx context.Context, cmd string, sudo bool,
 
 	// try to acquire root permission
 	if e.Sudo || sudo {
-		cmd = fmt.Sprintf("sudo -H bash -c \"%s\"", cmd)
+		cmd = fmt.Sprintf("/usr/bin/sudo -H bash -c \"%s\"", cmd)
 	}
 
 	// set a basic PATH in case it's empty on login

diff --git a/pkg/cluster/operation/check.go b/pkg/cluster/operation/check.go
@@ -831,7 +831,7 @@ func CheckDirPermission(ctx context.Context, e ctxt.Executor, user, path string)
 
 	_, stderr, err := e.Execute(ctx,
 		fmt.Sprintf(
-			"sudo -u %[1]s touch %[2]s/.tiup_cluster_check_file && rm -f %[2]s/.tiup_cluster_check_file",
+			"/usr/bin/sudo -u %[1]s touch %[2]s/.tiup_cluster_check_file && rm -f %[2]s/.tiup_cluster_check_file",
 			user,
 			path,
 		),