[Bugfix] Ensure Single workflow (#1831)

Author: ajanikow

Makefile

@@ -979,6 +979,6 @@ sync-charts:
 sync: sync-charts
 
 ci-check:
-	@$(MAKE) tidy vendor patch generate update-generated synchronize-v2alpha1-with-v1 sync fmt yamlfmt license protolint
+	@$(MAKE) tidy vendor generate update-generated synchronize-v2alpha1-with-v1 sync fmt yamlfmt license protolint
 	@git checkout -- go.sum # ignore changes in go.sum
 	@if [ ! -z "$$(git status --porcelain)" ]; then echo "There are uncommited changes!"; git status; exit 1; fi

pkg/deployment/agency/definitions.go

@@ -35,8 +35,8 @@ const (
 	CurrentKey = "Current"
 	TargetKey  = "Target"
 
-	CurrentMaintenanceServers = "MaintenanceServers"
-	CurrentServersKnown       = "ServersKnown"
+	CurrentMaintenanceDBServers = "MaintenanceDBServers"
+	CurrentServersKnown         = "ServersKnown"
 
 	TargetHotBackupKey = "HotBackup"
 
@@ -82,7 +82,7 @@ func GetAgencyReadRequestFields() ReadRequest {
 		GetAgencyKey(ArangoKey, PlanKey, PlanCoordinatorsKey),
 		GetAgencyKey(ArangoKey, CurrentKey, PlanCollectionsKey),
 		GetAgencyKey(ArangoKey, CurrentKey, CurrentServersKnown),
-		GetAgencyKey(ArangoKey, CurrentKey, CurrentMaintenanceServers),
+		GetAgencyKey(ArangoKey, CurrentKey, CurrentMaintenanceDBServers),
 		GetAgencyKey(ArangoKey, TargetKey, TargetHotBackupKey),
 		GetAgencyKey(ArangoKey, TargetKey, TargetJobToDoKey),
 		GetAgencyKey(ArangoKey, TargetKey, TargetJobPendingKey),

pkg/deployment/agency/state/current_maintenance_servers.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@
 
 package state
 
-type CurrentMaintenanceServers map[Server]CurrentMaintenanceServer
+type CurrentMaintenanceDBServers map[Server]CurrentMaintenanceServer
 
-func (s CurrentMaintenanceServers) InMaintenance(server Server) bool {
+func (s CurrentMaintenanceDBServers) InMaintenance(server Server) bool {
 	if v, ok := s[server]; ok {
 		return v.InMaintenance()
 	}

pkg/deployment/agency/state/state.go

@@ -47,8 +47,8 @@ type ServerKnown struct {
 }
 
 type Current struct {
-	MaintenanceServers CurrentMaintenanceServers `json:"MaintenanceServers,omitempty"`
-	Collections        CurrentCollections        `json:"Collections"`
+	MaintenanceDBServers CurrentMaintenanceDBServers `json:"MaintenanceDBServers,omitempty"`
+	Collections          CurrentCollections          `json:"Collections"`
 
 	// ServersKnown stores information about ArangoDB servers.
 	ServersKnown ServerMap[ServerKnown] `json:"ServersKnown,omitempty"`

pkg/deployment/agency/state/target.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

pkg/deployment/reconcile/action_wait_for_member_ready.go

@@ -68,14 +68,14 @@ func (a *actionWaitForMemberReady) CheckProgress(ctx context.Context) (bool, boo
 		return true, false, nil
 	}
 
-	cache, ok := a.actionCtx.GetAgencyCache()
-	if !ok {
-		a.log.Debug("AgencyCache is not ready")
-		return false, false, nil
-	}
-
 	switch a.action.Group {
 	case api.ServerGroupDBServers:
+		cache, ok := a.actionCtx.GetAgencyCache()
+		if !ok {
+			a.log.Debug("AgencyCache is not ready")
+			return false, false, nil
+		}
+
 		if !cache.Plan.DBServers.Exists(state.Server(member.ID)) {
 			a.log.Debug("DBServer not yet present")
 			return false, false, nil
@@ -90,6 +90,12 @@ func (a *actionWaitForMemberReady) CheckProgress(ctx context.Context) (bool, boo
 		}
 
 	case api.ServerGroupCoordinators:
+		cache, ok := a.actionCtx.GetAgencyCache()
+		if !ok {
+			a.log.Debug("AgencyCache is not ready")
+			return false, false, nil
+		}
+
 		if !cache.Plan.Coordinators.Exists(state.Server(member.ID)) {
 			a.log.Debug("Coordinator not yet present")
 			return false, false, nil
@@ -104,5 +110,9 @@ func (a *actionWaitForMemberReady) CheckProgress(ctx context.Context) (bool, boo
 		}
 	}
 
+	if member.Conditions.IsTrue(api.ConditionTypePendingRestart) || member.Conditions.IsTrue(api.ConditionTypePendingUpdate) {
+		return true, false, nil
+	}
+
 	return member.Conditions.IsTrue(api.ConditionTypeReady), false, nil
 }

pkg/deployment/reconcile/action_wait_for_member_up.go

@@ -77,7 +77,7 @@ func (a *actionWaitForMemberUp) CheckProgress(ctx context.Context) (bool, bool,
 	case api.ServerGroupTypeArangoD:
 		switch a.actionCtx.GetMode() {
 		case api.DeploymentModeSingle:
-			return a.checkProgressSingle(ctxChild), false, nil
+			return a.checkProgressSingle(), false, nil
 		case api.DeploymentModeActiveFailover:
 			if a.action.Group == api.ServerGroupAgents {
 				return a.checkProgressAgent(), false, nil
@@ -99,16 +99,18 @@ func (a *actionWaitForMemberUp) CheckProgress(ctx context.Context) (bool, bool,
 
 // checkProgressSingle checks the progress of the action in the case
 // of a single server.
-func (a *actionWaitForMemberUp) checkProgressSingle(ctx context.Context) bool {
-	c, err := a.actionCtx.GetMembersState().State().GetDatabaseClient()
-	if err != nil {
-		a.log.Err(err).Debug("Failed to create database client")
+func (a *actionWaitForMemberUp) checkProgressSingle() bool {
+	m, found := a.actionCtx.GetMemberStatusByID(a.MemberID())
+	if !found {
+		a.log.Error("No such member")
 		return false
 	}
-	if _, err := c.Version(ctx); err != nil {
-		a.log.Err(err).Debug("Failed to get version")
+
+	if !m.Conditions.IsTrue(api.ConditionTypeActive) {
+		a.log.Debug("Member not yet active")
 		return false
 	}
+
 	return true
 }
 
@@ -187,8 +189,8 @@ func (a *actionWaitForMemberUp) checkProgressCluster(ctx context.Context) bool {
 		}
 	}
 
-	if !m.Conditions.IsTrue(api.ConditionTypeReady) {
-		a.log.Debug("Member not yet ready")
+	if !m.Conditions.IsTrue(api.ConditionTypeActive) {
+		a.log.Debug("Member not yet active")
 		return false
 	}
 

pkg/deployment/resources/pod_inspector.go

@@ -308,7 +308,7 @@ func (r *Resources) InspectPods(ctx context.Context, cachedStatus inspectorInter
 
 		// Member Maintenance
 		if agencyCachePresent {
-			if agencyCache.Current.MaintenanceServers.InMaintenance(state.Server(memberStatus.ID)) {
+			if agencyCache.Current.MaintenanceDBServers.InMaintenance(state.Server(memberStatus.ID)) {
 				if memberStatus.Conditions.Update(api.ConditionTypeMemberMaintenanceMode, true, "ArangoDB Member maintenance enabled", "") {
 					updateMemberStatusNeeded = true
 					nextInterval = nextInterval.ReduceTo(recheckSoonPodInspectorInterval)