cluster/manager: fix the typo

pingcap · Jun 23, 2021 · 15d36d5 · 15d36d5
1 parent f8ae7b4
commit 15d36d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/pkg/cluster/manager/builder.go b/pkg/cluster/manager/builder.go
@@ -19,7 +19,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/pingcap/tiup/pkg/cluster/executor"
 	operator "github.com/pingcap/tiup/pkg/cluster/operation"
 	"github.com/pingcap/tiup/pkg/cluster/spec"
 	"github.com/pingcap/tiup/pkg/cluster/task"
@@ -174,8 +173,6 @@ func buildScaleOutTask(
 				base.User,
 				gOpt.SSHTimeout,
 				gOpt.OptTimeout,
-				gOpt.SSHType,
-				topo.BaseTopo().GlobalOptions.SSHType,
 				gOpt.SSHProxyHost,
 				gOpt.SSHProxyPort,
 				gOpt.SSHProxyUser,
@@ -460,7 +457,6 @@ func buildRefreshMonitoredConfigTasks(
 	globalOptions spec.GlobalOptions,
 	monitoredOptions *spec.MonitoredOptions,
 	sshTimeout, exeTimeout uint64,
-	sshType executor.SSHType,
 	gOpt operator.Options,
 	p *tui.SSHConnectionProps,
 ) []*task.StepDisplay {
@@ -489,7 +485,6 @@ func buildRefreshMonitoredConfigTasks(
 					globalOptions.User,
 					sshTimeout,
 					exeTimeout,
-					sshType,
 					gOpt.SSHProxyHost,
 					gOpt.SSHProxyPort,
 					gOpt.SSHProxyUser,

diff --git a/pkg/cluster/manager/reload.go b/pkg/cluster/manager/reload.go
@@ -36,8 +36,8 @@ func (m *Manager) Reload(name string, gOpt operator.Options, skipRestart, skipCo
 		return err
 	}
 
-	sshTimeout := opt.SSHTimeout
-	exeTimeout := opt.OptTimeout
+	sshTimeout := gOpt.SSHTimeout
+	exeTimeout := gOpt.OptTimeout
 
 	metadata, err := m.meta(name)
 	if err != nil {