cluster: increase default timeout transfer leader in upgrade progress (…

…#1434)

components/cluster/command/upgrade.go

@@ -42,7 +42,7 @@ func newUpgradeCmd() *cobra.Command {
 		},
 	}
 	cmd.Flags().BoolVar(&gOpt.Force, "force", false, "Force upgrade without transferring PD leader")
-	cmd.Flags().Uint64Var(&gOpt.APITimeout, "transfer-timeout", 300, "Timeout in seconds when transferring PD and TiKV store leaders")
+	cmd.Flags().Uint64Var(&gOpt.APITimeout, "transfer-timeout", 600, "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().BoolVarP(&offlineMode, "offline", "", false, "Upgrade a stopped cluster")
 

pkg/cluster/module/systemd.go

@@ -36,6 +36,7 @@ type SystemdModuleConfig struct {
 	ReloadDaemon bool          // run daemon-reload before other actions
 	Scope        string        // user, system or global
 	Force        bool          // add the `--force` arg to systemctl command
+	Signal       string        // specify the signal to send to process
 	Timeout      time.Duration // timeout to execute the command
 }
 
@@ -56,6 +57,10 @@ func NewSystemdModule(config SystemdModuleConfig) *SystemdModule {
 		systemctl = fmt.Sprintf("%s --force", systemctl)
 	}
 
+	if config.Signal != "" {
+		systemctl = fmt.Sprintf("%s --signal %s", systemctl, config.Signal)
+	}
+
 	switch config.Scope {
 	case SystemdScopeUser:
 		sudo = false // `--user` scope does not need root privilege

pkg/cluster/operation/upgrade.go

@@ -55,6 +55,7 @@ func Upgrade(
 		}
 
 		log.Infof("Upgrading component %s", component.Name())
+
 		// perform pre-upgrade actions of component
 		var origLeaderScheduleLimit int
 		var origRegionScheduleLimit int