Revisited scale up and scale down.

Author: lamai93

pkg/apis/deployment/v1alpha/member_status_list.go

@@ -142,7 +142,12 @@ func (l MemberStatusList) SelectMemberToRemove() (MemberStatus, error) {
 	if len(l) > 0 {
 		// Try to find a not ready member
 		for _, m := range l {
-			if m.Phase == MemberPhaseNone || !m.Conditions.IsTrue(ConditionTypeReady) {
+			if m.Phase == MemberPhaseNone {
+				return m, nil
+			}
+		}
+		for _, m := range l {
+			if !m.Conditions.IsTrue(ConditionTypeReady) {
 				return m, nil
 			}
 		}

pkg/deployment/reconcile/action_cleanout_member.go

@@ -95,6 +95,10 @@ func (a *actionCleanoutMember) CheckProgress(ctx context.Context) (bool, bool, e
 		// We wanted to remove and it is already gone. All ok
 		return true, false, nil
 	}
+	// do not try to clean out a pod that is not ready
+	if !m.Conditions.IsTrue(api.ConditionTypeReady) {
+		return false, true, nil
+	}
 	c, err := a.actionCtx.GetDatabaseClient(ctx)
 	if err != nil {
 		log.Debug().Err(err).Msg("Failed to create database client")

pkg/deployment/reconcile/action_shutdown_member.go

@@ -63,6 +63,10 @@ func (a *actionShutdownMember) Start(ctx context.Context) (bool, error) {
 		return true, nil
 	}
 	if group.IsArangod() {
+		// do not try to shut down a pod that is not ready
+		if !m.Conditions.IsTrue(api.ConditionTypeReady) {
+			return true, nil
+		}
 		// Invoke shutdown endpoint
 		c, err := a.actionCtx.GetServerClient(ctx, group, a.action.MemberID)
 		if err != nil {

pkg/deployment/reconcile/plan_builder.go

@@ -371,17 +371,13 @@ func createScalePlan(log zerolog.Logger, members api.MemberStatusList, group api
 				Str("member-id", m.ID).
 				Str("phase", string(m.Phase)).
 				Msg("Found member to remove")
-			if m.Conditions.IsTrue(api.ConditionTypeReady) {
-				if group == api.ServerGroupDBServers {
-					plan = append(plan,
-						api.NewAction(api.ActionTypeCleanOutMember, group, m.ID),
-					)
-				}
+			if group == api.ServerGroupDBServers {
 				plan = append(plan,
-					api.NewAction(api.ActionTypeShutdownMember, group, m.ID),
+					api.NewAction(api.ActionTypeCleanOutMember, group, m.ID),
 				)
 			}
 			plan = append(plan,
+				api.NewAction(api.ActionTypeShutdownMember, group, m.ID),
 				api.NewAction(api.ActionTypeRemoveMember, group, m.ID),
 			)
 			log.Debug().