cluster: restart prometheus after scale-in the cluster (#717)

Co-authored-by: ti-srebot <[email protected]> Co-authored-by: Lonng <[email protected]>
pingcap · Aug 27, 2020 · 4978e39 · 4978e39
1 parent e8a7b45
commit 4978e39
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/components/cluster/command/scale_in.go b/components/cluster/command/scale_in.go
@@ -48,6 +48,7 @@ func newScaleInCmd() *cobra.Command {
 			return manager.ScaleIn(
 				clusterName,
 				skipConfirm,
+				gOpt.OptTimeout,
 				gOpt.SSHTimeout,
 				gOpt.NativeSSH,
 				gOpt.Force,

diff --git a/components/dm/command/scale_in.go b/components/dm/command/scale_in.go
@@ -54,6 +54,7 @@ func newScaleInCmd() *cobra.Command {
 			return manager.ScaleIn(
 				clusterName,
 				skipConfirm,
+				gOpt.OptTimeout,
 				gOpt.SSHTimeout,
 				gOpt.NativeSSH,
 				gOpt.Force,

diff --git a/pkg/cluster/manager.go b/pkg/cluster/manager.go
@@ -1138,6 +1138,7 @@ func (m *Manager) Deploy(
 func (m *Manager) ScaleIn(
 	clusterName string,
 	skipConfirm bool,
+	optTimeout int64,
 	sshTimeout int64,
 	nativeSSH bool,
 	force bool,
@@ -1241,7 +1242,14 @@ func (m *Manager) ScaleIn(
 	// TODO: support command scale in operation.
 	scale(b, metadata)
 
-	t := b.Parallel(regenConfigTasks...).Build()
+	t := b.Parallel(regenConfigTasks...).
+		Func("RestartMonitor", func(ctx *task.Context) error {
+			return operator.Restart(ctx, metadata.GetTopology(), operator.Options{
+				Roles:      []string{spec.ComponentPrometheus},
+				OptTimeout: optTimeout,
+			})
+		}).
+		Build()
 
 	if err := t.Execute(task.NewContext()); err != nil {
 		if errorx.Cast(err) != nil {
@@ -1865,7 +1873,7 @@ func buildScaleOutTask(
 			return operator.Start(ctx, newPart, operator.Options{OptTimeout: optTimeout})
 		}).
 		Parallel(refreshConfigTasks...).
-		Func("RestartCluster", func(ctx *task.Context) error {
+		Func("RestartMonitor", func(ctx *task.Context) error {
 			return operator.Restart(ctx, metadata.GetTopology(), operator.Options{
 				Roles:      []string{spec.ComponentPrometheus},
 				OptTimeout: optTimeout,