Merge branch 'master' into fix-depends

pingcap · May 17, 2021 · 4b07581 · 4b07581
2 parents 04d61e9 + dd6b818
commit 4b07581
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/cluster/manager/scale_in.go b/pkg/cluster/manager/scale_in.go
@@ -67,9 +67,11 @@ func (m *Manager) ScaleIn(
 	}
 
 	metadata, err := m.meta(name)
-	if err != nil && !errors.Is(perrs.Cause(err), meta.ErrValidate) &&
+	if err != nil &&
+		!errors.Is(perrs.Cause(err), meta.ErrValidate) &&
 		!errors.Is(perrs.Cause(err), spec.ErrMultipleTiSparkMaster) &&
-		!errors.Is(perrs.Cause(err), spec.ErrMultipleTisparkWorker) {
+		!errors.Is(perrs.Cause(err), spec.ErrMultipleTisparkWorker) &&
+		!errors.Is(perrs.Cause(err), spec.ErrNoTiSparkMaster) {
 		// ignore conflict check error, node may be deployed by former version
 		// that lack of some certain conflict checks
 		return err