*: set timeout's type from int64 to uint64 (#818)

components/cluster/command/patch.go

@@ -47,6 +47,6 @@ func newPatchCmd() *cobra.Command {
 	cmd.Flags().BoolVar(&overwrite, "overwrite", false, "Use this package in the future scale-out operations")
 	cmd.Flags().StringSliceVarP(&gOpt.Nodes, "node", "N", nil, "Specify the nodes")
 	cmd.Flags().StringSliceVarP(&gOpt.Roles, "role", "R", nil, "Specify the role")
-	cmd.Flags().Int64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring PD and TiKV store leaders")
+	cmd.Flags().Uint64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring PD and TiKV store leaders")
 	return cmd
 }

components/cluster/command/reload.go

@@ -43,7 +43,7 @@ func newReloadCmd() *cobra.Command {
 	cmd.Flags().BoolVar(&gOpt.Force, "force", false, "Force reload without transferring PD leader")
 	cmd.Flags().StringSliceVarP(&gOpt.Roles, "role", "R", nil, "Only start specified roles")
 	cmd.Flags().StringSliceVarP(&gOpt.Nodes, "node", "N", nil, "Only start specified nodes")
-	cmd.Flags().Int64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring PD and TiKV store leaders")
+	cmd.Flags().Uint64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring PD and TiKV store leaders")
 	cmd.Flags().BoolVarP(&gOpt.IgnoreConfigCheck, "ignore-config-check", "", false, "Ignore the config check result")
 	cmd.Flags().BoolVar(&skipRestart, "skip-restart", false, "Only refresh configuration to remote and do not restart services")
 

components/cluster/command/root.go

@@ -131,10 +131,10 @@ func init() {
 
 	cliutil.BeautifyCobraUsageAndHelp(rootCmd)
 
-	rootCmd.PersistentFlags().Int64Var(&gOpt.SSHTimeout, "ssh-timeout", 5, "Timeout in seconds to connect host via SSH, ignored for operations that don't need an SSH connection.")
+	rootCmd.PersistentFlags().Uint64Var(&gOpt.SSHTimeout, "ssh-timeout", 5, "Timeout in seconds to connect host via SSH, ignored for operations that don't need an SSH connection.")
 	// the value of wait-timeout is also used for `systemctl` commands, as the default timeout of systemd for
 	// start/stop operations is 90s, the default value of this argument is better be longer than that
-	rootCmd.PersistentFlags().Int64Var(&gOpt.OptTimeout, "wait-timeout", 120, "Timeout in seconds to wait for an operation to complete, ignored for operations that don't fit.")
+	rootCmd.PersistentFlags().Uint64Var(&gOpt.OptTimeout, "wait-timeout", 120, "Timeout in seconds to wait for an operation to complete, ignored for operations that don't fit.")
 	rootCmd.PersistentFlags().BoolVarP(&skipConfirm, "yes", "y", false, "Skip all confirmations and assumes 'yes'")
 	rootCmd.PersistentFlags().BoolVar(&gOpt.NativeSSH, "native-ssh", gOpt.NativeSSH, "Use the native SSH client installed on local system instead of the build-in one (experimental).")
 	rootCmd.PersistentFlags().StringVar((*string)(&gOpt.SSHType), "ssh", "", "(experimental) The executor type: 'builtin', 'system', 'none'.")

components/cluster/command/scale_in.go

@@ -72,7 +72,7 @@ func newScaleInCmd() *cobra.Command {
 	}
 
 	cmd.Flags().StringSliceVarP(&gOpt.Nodes, "node", "N", nil, "Specify the nodes")
-	cmd.Flags().Int64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring PD and TiKV store leaders")
+	cmd.Flags().Uint64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring PD and TiKV store leaders")
 	cmd.Flags().BoolVar(&gOpt.Force, "force", false, "Force just try stop and destroy instance before removing the instance from topo")
 
 	_ = cmd.MarkFlagRequired("node")

components/cluster/command/upgrade.go

@@ -35,7 +35,7 @@ func newUpgradeCmd() *cobra.Command {
 		},
 	}
 	cmd.Flags().BoolVar(&gOpt.Force, "force", false, "Force upgrade without transferring PD leader")
-	cmd.Flags().Int64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring PD and TiKV store leaders")
+	cmd.Flags().Uint64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring PD and TiKV store leaders")
 	cmd.Flags().BoolVarP(&gOpt.IgnoreConfigCheck, "ignore-config-check", "", false, "Ignore the config check result")
 
 	return cmd

components/dm/ansible/import.go

@@ -117,7 +117,7 @@ type Importer struct {
 	dir               string // ansible directory.
 	inventoryFileName string
 	sshType           executor.SSHType
-	sshTimeout        int64
+	sshTimeout        uint64
 
 	// following vars parse from ansbile
 	user    string
@@ -130,7 +130,7 @@ type Importer struct {
 
 // NewImporter create an Importer.
 // @sshTimeout: set 0 to use a default value
-func NewImporter(ansibleDir, inventoryFileName string, sshType executor.SSHType, sshTimeout int64) (*Importer, error) {
+func NewImporter(ansibleDir, inventoryFileName string, sshType executor.SSHType, sshTimeout uint64) (*Importer, error) {
 	dir, err := filepath.Abs(ansibleDir)
 	if err != nil {
 		return nil, errors.AddStack(err)

components/dm/command/display.go

@@ -57,7 +57,7 @@ func newDisplayCmd() *cobra.Command {
 
 	cmd.Flags().StringSliceVarP(&gOpt.Roles, "role", "R", nil, "Only display specified roles")
 	cmd.Flags().StringSliceVarP(&gOpt.Nodes, "node", "N", nil, "Only display specified nodes")
-	cmd.Flags().Int64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring dm-master leaders")
+	cmd.Flags().Uint64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring dm-master leaders")
 	return cmd
 }
 

components/dm/command/patch.go

@@ -47,6 +47,6 @@ func newPatchCmd() *cobra.Command {
 	cmd.Flags().BoolVar(&overwrite, "overwrite", false, "Use this package in the future scale-out operations")
 	cmd.Flags().StringSliceVarP(&gOpt.Nodes, "node", "N", nil, "Specify the nodes")
 	cmd.Flags().StringSliceVarP(&gOpt.Roles, "role", "R", nil, "Specify the role")
-	cmd.Flags().Int64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring dm-master leaders")
+	cmd.Flags().Uint64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring dm-master leaders")
 	return cmd
 }

components/dm/command/reload.go

@@ -41,7 +41,7 @@ func newReloadCmd() *cobra.Command {
 
 	cmd.Flags().StringSliceVarP(&gOpt.Roles, "role", "R", nil, "Only start specified roles")
 	cmd.Flags().StringSliceVarP(&gOpt.Nodes, "node", "N", nil, "Only start specified nodes")
-	cmd.Flags().Int64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring dm-master leaders")
+	cmd.Flags().Uint64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring dm-master leaders")
 	cmd.Flags().BoolVarP(&gOpt.IgnoreConfigCheck, "ignore-config-check", "", false, "Ignore the config check result")
 	cmd.Flags().BoolVar(&skipRestart, "skip-restart", false, "Only refresh configuration to remote and do not restart services")
 

components/dm/command/root.go

@@ -106,8 +106,8 @@ func init() {
 
 	cliutil.BeautifyCobraUsageAndHelp(rootCmd)
 
-	rootCmd.PersistentFlags().Int64Var(&gOpt.SSHTimeout, "ssh-timeout", 5, "Timeout in seconds to connect host via SSH, ignored for operations that don't need an SSH connection.")
-	rootCmd.PersistentFlags().Int64Var(&gOpt.OptTimeout, "wait-timeout", 60, "Timeout in seconds to wait for an operation to complete, ignored for operations that don't fit.")
+	rootCmd.PersistentFlags().Uint64Var(&gOpt.SSHTimeout, "ssh-timeout", 5, "Timeout in seconds to connect host via SSH, ignored for operations that don't need an SSH connection.")
+	rootCmd.PersistentFlags().Uint64Var(&gOpt.OptTimeout, "wait-timeout", 60, "Timeout in seconds to wait for an operation to complete, ignored for operations that don't fit.")
 	rootCmd.PersistentFlags().BoolVarP(&skipConfirm, "yes", "y", false, "Skip all confirmations and assumes 'yes'")
 	rootCmd.PersistentFlags().BoolVar(&gOpt.NativeSSH, "native-ssh", gOpt.NativeSSH, "Use the SSH client installed on local system instead of the build-in one.")
 	rootCmd.PersistentFlags().StringVar((*string)(&gOpt.SSHType), "ssh", "", "The executor type: 'builtin', 'system', 'none'")

components/dm/command/scale_in.go

@@ -66,7 +66,7 @@ func newScaleInCmd() *cobra.Command {
 	}
 
 	cmd.Flags().StringSliceVarP(&gOpt.Nodes, "node", "N", nil, "Specify the nodes")
-	cmd.Flags().Int64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring dm-master leaders")
+	cmd.Flags().Uint64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring dm-master leaders")
 	cmd.Flags().BoolVar(&gOpt.Force, "force", false, "Force just try stop and destroy instance before removing the instance from topo")
 
 	_ = cmd.MarkFlagRequired("node")

components/dm/command/upgrade.go

@@ -30,7 +30,7 @@ func newUpgradeCmd() *cobra.Command {
 		},
 	}
 	cmd.Flags().BoolVar(&gOpt.Force, "force", false, "Force upgrade won't transfer leader")
-	cmd.Flags().Int64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring dm-master leaders")
+	cmd.Flags().Uint64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring dm-master leaders")
 	cmd.Flags().BoolVarP(&gOpt.IgnoreConfigCheck, "ignore-config-check", "", false, "Ignore the config check result")
 
 	return cmd

pkg/cluster/ansible/config.go

@@ -25,7 +25,7 @@ import (
 )
 
 // ImportConfig copies config files from cluster which deployed through tidb-ansible
-func ImportConfig(name string, clsMeta *spec.ClusterMeta, sshTimeout int64, sshType executor.SSHType) error {
+func ImportConfig(name string, clsMeta *spec.ClusterMeta, sshTimeout uint64, sshType executor.SSHType) error {
 	// there may be already cluster dir, skip create
 	//if err := os.MkdirAll(meta.ClusterPath(name), 0755); err != nil {
 	//	return err

pkg/cluster/ansible/inventory.go

@@ -49,7 +49,7 @@ var (
 )
 
 // ParseAndImportInventory builds a basic ClusterMeta from the main Ansible inventory
-func ParseAndImportInventory(dir, ansCfgFile string, clsMeta *spec.ClusterMeta, inv *aini.InventoryData, sshTimeout int64, sshType executor.SSHType) error {
+func ParseAndImportInventory(dir, ansCfgFile string, clsMeta *spec.ClusterMeta, inv *aini.InventoryData, sshTimeout uint64, sshType executor.SSHType) error {
 	if err := parseGroupVars(dir, ansCfgFile, clsMeta, inv); err != nil {
 		return err
 	}

pkg/cluster/ansible/service.go

@@ -32,7 +32,7 @@ var (
 )
 
 // parseDirs sets values of directories of component
-func parseDirs(user string, ins spec.InstanceSpec, sshTimeout int64, sshType executor.SSHType) (spec.InstanceSpec, error) {
+func parseDirs(user string, ins spec.InstanceSpec, sshTimeout uint64, sshType executor.SSHType) (spec.InstanceSpec, error) {
 	hostName, sshPort := ins.SSH()
 
 	e, err := executor.New(sshType, false, executor.SSHConfig{

pkg/cluster/manager.go

@@ -1025,8 +1025,8 @@ func (m *Manager) Deploy(
 	opt DeployOptions,
 	afterDeploy func(b *task.Builder, newPart spec.Topology),
 	skipConfirm bool,
-	optTimeout int64,
-	sshTimeout int64,
+	optTimeout uint64,
+	sshTimeout uint64,
 	sshType executor.SSHType,
 ) error {
 	if err := clusterutil.ValidateClusterNameOrError(clusterName); err != nil {
@@ -1307,8 +1307,8 @@ func (m *Manager) Deploy(
 func (m *Manager) ScaleIn(
 	clusterName string,
 	skipConfirm bool,
-	optTimeout int64,
-	sshTimeout int64,
+	optTimeout uint64,
+	sshTimeout uint64,
 	sshType executor.SSHType,
 	force bool,
 	nodes []string,
@@ -1439,8 +1439,8 @@ func (m *Manager) ScaleOut(
 	final func(b *task.Builder, name string, meta spec.Metadata),
 	opt ScaleOutOptions,
 	skipConfirm bool,
-	optTimeout int64,
-	sshTimeout int64,
+	optTimeout uint64,
+	sshTimeout uint64,
 	sshType executor.SSHType,
 ) error {
 	metadata, err := m.meta(clusterName)
@@ -1853,8 +1853,8 @@ func buildScaleOutTask(
 	sshConnProps *cliutil.SSHConnectionProps,
 	newPart spec.Topology,
 	patchedComponents set.StringSet,
-	optTimeout int64,
-	sshTimeout int64,
+	optTimeout uint64,
+	sshTimeout uint64,
 	sshType executor.SSHType,
 	afterDeploy func(b *task.Builder, newPart spec.Topology),
 	final func(b *task.Builder, name string, meta spec.Metadata),
@@ -2135,7 +2135,7 @@ func buildMonitoredDeployTask(
 	globalOptions *spec.GlobalOptions,
 	monitoredOptions *spec.MonitoredOptions,
 	version string,
-	sshTimeout int64,
+	sshTimeout uint64,
 	sshType executor.SSHType,
 ) (downloadCompTasks []*task.StepDisplay, deployCompTasks []*task.StepDisplay) {
 	if monitoredOptions == nil {
@@ -2210,7 +2210,7 @@ func refreshMonitoredConfigTask(
 	uniqueHosts map[string]hostInfo, // host -> ssh-port, os, arch
 	globalOptions spec.GlobalOptions,
 	monitoredOptions *spec.MonitoredOptions,
-	sshTimeout int64,
+	sshTimeout uint64,
 	sshType executor.SSHType,
 ) []*task.StepDisplay {
 	if monitoredOptions == nil {

pkg/cluster/operation/action.go

@@ -383,7 +383,7 @@ func Restart(
 }
 
 // StartMonitored start BlackboxExporter and NodeExporter
-func StartMonitored(getter ExecutorGetter, instance spec.Instance, options *spec.MonitoredOptions, timeout int64) error {
+func StartMonitored(getter ExecutorGetter, instance spec.Instance, options *spec.MonitoredOptions, timeout uint64) error {
 	ports := map[string]int{
 		spec.ComponentNodeExporter:     options.NodeExporterPort,
 		spec.ComponentBlackboxExporter: options.BlackboxExporterPort,
@@ -425,7 +425,7 @@ func StartMonitored(getter ExecutorGetter, instance spec.Instance, options *spec
 	return nil
 }
 
-func restartInstance(getter ExecutorGetter, ins spec.Instance, timeout int64) error {
+func restartInstance(getter ExecutorGetter, ins spec.Instance, timeout uint64) error {
 	e := getter.Get(ins.GetHost())
 	log.Infof("\tRestarting instance %s", ins.GetHost())
 
@@ -464,7 +464,7 @@ func restartInstance(getter ExecutorGetter, ins spec.Instance, timeout int64) er
 }
 
 // RestartComponent restarts the component.
-func RestartComponent(getter ExecutorGetter, instances []spec.Instance, timeout int64) error {
+func RestartComponent(getter ExecutorGetter, instances []spec.Instance, timeout uint64) error {
 	if len(instances) <= 0 {
 		return nil
 	}
@@ -482,7 +482,7 @@ func RestartComponent(getter ExecutorGetter, instances []spec.Instance, timeout
 	return nil
 }
 
-func enableInstance(getter ExecutorGetter, ins spec.Instance, timeout int64, isEnable bool) error {
+func enableInstance(getter ExecutorGetter, ins spec.Instance, timeout uint64, isEnable bool) error {
 	e := getter.Get(ins.GetHost())
 	if isEnable {
 		log.Infof("\tEnabling instance %s %s:%d", ins.ComponentName(), ins.GetHost(), ins.GetPort())
@@ -528,7 +528,7 @@ func enableInstance(getter ExecutorGetter, ins spec.Instance, timeout int64, isE
 	return nil
 }
 
-func startInstance(getter ExecutorGetter, ins spec.Instance, timeout int64) error {
+func startInstance(getter ExecutorGetter, ins spec.Instance, timeout uint64) error {
 	e := getter.Get(ins.GetHost())
 	log.Infof("\tStarting instance %s %s:%d",
 		ins.ComponentName(),
@@ -611,7 +611,7 @@ func EnableComponent(getter ExecutorGetter, instances []spec.Instance, options O
 // EnableMonitored enable/disable monitor service in a cluster
 func EnableMonitored(
 	getter ExecutorGetter, instance spec.Instance,
-	options *spec.MonitoredOptions, timeout int64, isEnable bool,
+	options *spec.MonitoredOptions, timeout uint64, isEnable bool,
 ) error {
 	action := "disable"
 	if isEnable {
@@ -687,7 +687,7 @@ func StartComponent(getter ExecutorGetter, instances []spec.Instance, options Op
 }
 
 // StopMonitored stop BlackboxExporter and NodeExporter
-func StopMonitored(getter ExecutorGetter, instance spec.Instance, options *spec.MonitoredOptions, timeout int64) error {
+func StopMonitored(getter ExecutorGetter, instance spec.Instance, options *spec.MonitoredOptions, timeout uint64) error {
 	ports := map[string]int{
 		spec.ComponentNodeExporter:     options.NodeExporterPort,
 		spec.ComponentBlackboxExporter: options.BlackboxExporterPort,
@@ -742,7 +742,7 @@ func StopMonitored(getter ExecutorGetter, instance spec.Instance, options *spec.
 	return nil
 }
 
-func stopInstance(getter ExecutorGetter, ins spec.Instance, timeout int64) error {
+func stopInstance(getter ExecutorGetter, ins spec.Instance, timeout uint64) error {
 	e := getter.Get(ins.GetHost())
 	log.Infof("\tStopping instance %s", ins.GetHost())
 
@@ -788,7 +788,7 @@ func stopInstance(getter ExecutorGetter, ins spec.Instance, timeout int64) error
 }
 
 // StopComponent stop the instances.
-func StopComponent(getter ExecutorGetter, instances []spec.Instance, timeout int64) error {
+func StopComponent(getter ExecutorGetter, instances []spec.Instance, timeout uint64) error {
 	if len(instances) <= 0 {
 		return nil
 	}

pkg/cluster/operation/destroy.go

@@ -133,7 +133,7 @@ func DeleteGlobalDirs(getter ExecutorGetter, host string, options *spec.GlobalOp
 }
 
 // DestroyMonitored destroy the monitored service.
-func DestroyMonitored(getter ExecutorGetter, inst spec.Instance, options *spec.MonitoredOptions, timeout int64) error {
+func DestroyMonitored(getter ExecutorGetter, inst spec.Instance, options *spec.MonitoredOptions, timeout uint64) error {
 	e := getter.Get(inst.GetHost())
 	log.Infof("Destroying monitored %s", inst.GetHost())
 

pkg/cluster/operation/operation.go

@@ -26,9 +26,9 @@ type Options struct {
 	Roles             []string
 	Nodes             []string
 	Force             bool             // Option for upgrade subcommand
-	SSHTimeout        int64            // timeout in seconds when connecting an SSH server
-	OptTimeout        int64            // timeout in seconds for operations that support it, not to confuse with SSH timeout
-	APITimeout        int64            // timeout in seconds for API operations that support it, like transfering store leader
+	SSHTimeout        uint64           // timeout in seconds when connecting an SSH server
+	OptTimeout        uint64           // timeout in seconds for operations that support it, not to confuse with SSH timeout
+	APITimeout        uint64           // timeout in seconds for API operations that support it, like transfering store leader
 	IgnoreConfigCheck bool             // should we ignore the config check result after init config
 	NativeSSH         bool             // should use native ssh client or builtin easy ssh (deprecated, shoule use SSHType)
 	SSHType           executor.SSHType // the ssh type: 'builtin', 'system', 'none'

pkg/cluster/operation/scale_in.go

@@ -291,7 +291,7 @@ func deleteMember(
 	instance spec.Instance,
 	pdClient *api.PDClient,
 	binlogClient *api.BinlogClient,
-	timeoutSecond int64,
+	timeoutSecond uint64,
 ) error {
 	timeoutOpt := &utils.RetryOption{
 		Timeout: time.Second * time.Duration(timeoutSecond),

pkg/cluster/spec/instance.go

@@ -70,7 +70,7 @@ type RollingUpdateInstance interface {
 type Instance interface {
 	InstanceSpec
 	ID() string
-	Ready(executor.Executor, int64) error
+	Ready(executor.Executor, uint64) error
 	InitConfig(e executor.Executor, clusterName string, clusterVersion string, deployUser string, paths meta.DirPaths) error
 	ScaleConfig(e executor.Executor, topo Topology, clusterName string, clusterVersion string, deployUser string, paths meta.DirPaths) error
 	PrepareStart(tlsCfg *tls.Config) error
@@ -91,7 +91,7 @@ type Instance interface {
 }
 
 // PortStarted wait until a port is being listened
-func PortStarted(e executor.Executor, port int, timeout int64) error {
+func PortStarted(e executor.Executor, port int, timeout uint64) error {
 	c := module.WaitForConfig{
 		Port:    port,
 		State:   "started",
@@ -102,7 +102,7 @@ func PortStarted(e executor.Executor, port int, timeout int64) error {
 }
 
 // PortStopped wait until a port is being released
-func PortStopped(e executor.Executor, port int, timeout int64) error {
+func PortStopped(e executor.Executor, port int, timeout uint64) error {
 	c := module.WaitForConfig{
 		Port:    port,
 		State:   "stopped",
@@ -128,7 +128,7 @@ type BaseInstance struct {
 }
 
 // Ready implements Instance interface
-func (i *BaseInstance) Ready(e executor.Executor, timeout int64) error {
+func (i *BaseInstance) Ready(e executor.Executor, timeout uint64) error {
 	return PortStarted(e, i.Port, timeout)
 }