Skip to content

Commit afcaf6f

Browse files
cluster: ignore no tispark master error when listing and scaling in clusters (#920)
1 parent bd9a03a commit afcaf6f

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

pkg/cluster/manager.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,8 @@ func (m *Manager) ListCluster() error {
262262

263263
for _, name := range names {
264264
metadata, err := m.meta(name)
265-
if err != nil && !errors.Is(perrs.Cause(err), meta.ErrValidate) {
265+
if err != nil && !errors.Is(perrs.Cause(err), meta.ErrValidate) &&
266+
!errors.Is(perrs.Cause(err), spec.ErrNoTiSparkMaster) {
266267
return perrs.Trace(err)
267268
}
268269

@@ -347,7 +348,9 @@ func (m *Manager) CleanCluster(clusterName string, gOpt operator.Options, cleanO
347348
func (m *Manager) DestroyCluster(clusterName string, gOpt operator.Options, destroyOpt operator.Options, skipConfirm bool) error {
348349
metadata, err := m.meta(clusterName)
349350
if err != nil && !errors.Is(perrs.Cause(err), meta.ErrValidate) &&
350-
!errors.Is(perrs.Cause(err), spec.ErrNoTiSparkMaster) {
351+
!errors.Is(perrs.Cause(err), spec.ErrNoTiSparkMaster) &&
352+
!errors.Is(perrs.Cause(err), spec.ErrMultipleTiSparkMaster) &&
353+
!errors.Is(perrs.Cause(err), spec.ErrMultipleTisparkWorker) {
351354
return perrs.AddStack(err)
352355
}
353356

@@ -1366,7 +1369,9 @@ func (m *Manager) ScaleIn(
13661369
}
13671370

13681371
metadata, err := m.meta(clusterName)
1369-
if err != nil && !errors.Is(perrs.Cause(err), meta.ErrValidate) {
1372+
if err != nil && !errors.Is(perrs.Cause(err), meta.ErrValidate) &&
1373+
!errors.Is(perrs.Cause(err), spec.ErrMultipleTiSparkMaster) &&
1374+
!errors.Is(perrs.Cause(err), spec.ErrMultipleTisparkWorker) {
13701375
// ignore conflict check error, node may be deployed by former version
13711376
// that lack of some certain conflict checks
13721377
return perrs.AddStack(err)

0 commit comments

Comments
 (0)