Iter

Author: ajanikow

pkg/apis/deployment/v2alpha1/actions.generated.go

@@ -47,6 +47,7 @@ const (
 
 	SupervisionKey            = "Supervision"
 	SupervisionMaintenanceKey = "Maintenance"
+	SupervisionHealthKey      = "Health"
 
 	TargetJobToDoKey     = "ToDo"
 	TargetJobPendingKey  = "Pending"
@@ -74,6 +75,7 @@ func GetAgencyReadRequest(elements ...[]string) ReadRequest {
 func GetAgencyReadRequestFields() ReadRequest {
 	return GetAgencyReadRequest([]string{
 		GetAgencyKey(ArangoKey, SupervisionKey, SupervisionMaintenanceKey),
+		GetAgencyKey(ArangoKey, SupervisionKey, SupervisionHealthKey),
 		GetAgencyKey(ArangoKey, PlanKey, PlanCollectionsKey),
 		GetAgencyKey(ArangoKey, PlanKey, PlanDatabasesKey),
 		GetAgencyKey(ArangoKey, PlanKey, PlanDBServersKey),

pkg/deployment/agency/definitions.go

@@ -61,10 +61,6 @@ type Plan struct {
 	Coordinators ServerMap[string] `json:"Coordinators,omitempty"`
 }
 
-type Supervision struct {
-	Maintenance Timestamp `json:"Maintenance,omitempty"`
-}
-
 type ShardCountDetails struct {
 	Leader, Follower int
 }

pkg/deployment/agency/state/state.go

@@ -0,0 +1,48 @@
+//
+// DISCLAIMER
+//
+// Copyright 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+
+package state
+
+type Supervision struct {
+	Maintenance Timestamp `json:"Maintenance,omitempty"`
+
+	Health ServerMap[SupervisionHealthServer] `json:"Health,omitempty"`
+}
+
+type SupervisionHealthServerStatus string
+
+const (
+	SupervisionHealthServerStatusGood SupervisionHealthServerStatus = "GOOD"
+)
+
+type SupervisionHealthServerSyncStatus string
+
+const (
+	SupervisionHealthServerSyncStatusServing SupervisionHealthServerSyncStatus = "SERVING"
+)
+
+type SupervisionHealthServer struct {
+	Status     SupervisionHealthServerStatus     `json:"Status,omitempty"`
+	SyncStatus SupervisionHealthServerSyncStatus `json:"SyncStatus,omitempty"`
+}
+
+func (s SupervisionHealthServer) IsHealthy() bool {
+	return s.Status == SupervisionHealthServerStatusGood && s.SyncStatus == SupervisionHealthServerSyncStatusServing
+}

pkg/deployment/agency/state/supervision.go

@@ -80,11 +80,28 @@ func (a *actionWaitForMemberReady) CheckProgress(ctx context.Context) (bool, boo
 			a.log.Debug("DBServer not yet present")
 			return false, false, nil
 		}
+
+		if s, ok := cache.Supervision.Health[state.Server(member.ID)]; !ok {
+			a.log.Debug("DBServer not yet present on the health")
+			return false, false, nil
+		} else if !s.IsHealthy() {
+			a.log.Str("Status", string(s.Status)).Str("SyncStatus", string(s.SyncStatus)).Debug("DBServer not yet healthy")
+			return false, false, nil
+		}
+
 	case api.ServerGroupCoordinators:
 		if !cache.Plan.Coordinators.Exists(state.Server(member.ID)) {
 			a.log.Debug("Coordinator not yet present")
 			return false, false, nil
 		}
+
+		if s, ok := cache.Supervision.Health[state.Server(member.ID)]; !ok {
+			a.log.Debug("Coordinator not yet present on the health")
+			return false, false, nil
+		} else if !s.IsHealthy() {
+			a.log.Str("Status", string(s.Status)).Str("SyncStatus", string(s.SyncStatus)).Debug("DBServer not yet healthy")
+			return false, false, nil
+		}
 	}
 
 	return member.Conditions.IsTrue(api.ConditionTypeReady), false, nil