[Bugfix] Agency Cache Reload (#1823)

Author: ajanikow

CHANGELOG.md

@@ -11,6 +11,7 @@
 - (Bugfix) Add missing ArangoDeployment ExternalAccess Managed Type definition
 - (Feature) Agency DBServer Discovery
 - (Bugfix) Fix Manifests
+- (Bugfix) Agency Cache Reload
 
 ## [1.2.44](https://github.com/arangodb/kube-arangodb/tree/1.2.44) (2025-02-03)
 - (Maintenance) Kubernetes 1.31.1 libraries

pkg/deployment/agency/cache.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2024 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.
@@ -155,6 +155,8 @@ type Cache interface {
 	Health() (Health, bool)
 	// ShardsInSyncMap returns last in sync state of shards. If no state is available, false is returned.
 	ShardsInSyncMap() (state.ShardsSyncStatus, bool)
+
+	Invalidate()
 }
 
 func NewCache(namespace, name string, mode *api.DeploymentMode) Cache {
@@ -214,6 +216,9 @@ func (c cacheSingle) Data() (state.State, bool) {
 	return state.State{}, true
 }
 
+func (c cacheSingle) Invalidate() {
+}
+
 type cache struct {
 	namespace, name string
 
@@ -228,6 +233,10 @@ type cache struct {
 	shardsSyncStatus state.ShardsSyncStatus
 }
 
+func (c *cache) Invalidate() {
+	c.loader.Invalidate()
+}
+
 func (c *cache) WrapLogger(in *zerolog.Event) *zerolog.Event {
 	return in.Str("namespace", c.namespace).Str("name", c.name)
 }

pkg/deployment/agency/definitions.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.
@@ -40,8 +40,10 @@ const (
 
 	TargetHotBackupKey = "HotBackup"
 
-	PlanCollectionsKey = "Collections"
-	PlanDatabasesKey   = "Databases"
+	PlanCollectionsKey  = "Collections"
+	PlanDatabasesKey    = "Databases"
+	PlanDBServersKey    = "DBServers"
+	PlanCoordinatorsKey = "Coordinators"
 
 	SupervisionKey            = "Supervision"
 	SupervisionMaintenanceKey = "Maintenance"
@@ -74,6 +76,8 @@ func GetAgencyReadRequestFields() ReadRequest {
 		GetAgencyKey(ArangoKey, SupervisionKey, SupervisionMaintenanceKey),
 		GetAgencyKey(ArangoKey, PlanKey, PlanCollectionsKey),
 		GetAgencyKey(ArangoKey, PlanKey, PlanDatabasesKey),
+		GetAgencyKey(ArangoKey, PlanKey, PlanDBServersKey),
+		GetAgencyKey(ArangoKey, PlanKey, PlanCoordinatorsKey),
 		GetAgencyKey(ArangoKey, CurrentKey, PlanCollectionsKey),
 		GetAgencyKey(ArangoKey, CurrentKey, CurrentServersKnown),
 		GetAgencyKey(ArangoKey, CurrentKey, CurrentMaintenanceServers),

pkg/deployment/deployment.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2024 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.
@@ -200,7 +200,12 @@ func (d *Deployment) RefreshAgencyCache(ctx context.Context) (uint64, error) {
 				clients[m.ID] = a
 			}
 
-			return d.agencyCache.Reload(ctx, rsize, clients)
+			if offset, err := d.agencyCache.Reload(ctx, rsize, clients); err != nil {
+				d.agencyCache.Invalidate()
+				return 0, err
+			} else {
+				return offset, nil
+			}
 		}
 	}
 

pkg/logging/logger.go

@@ -259,6 +259,7 @@ type Logger interface {
 
 	Bool(key string, i bool) Logger
 	Str(key, value string) Logger
+	JSON(key string, value any) Logger
 	Strs(key string, values ...string) Logger
 	SinceStart(key string, start time.Time) Logger
 	Err(err error) Logger
@@ -395,6 +396,10 @@ func (c *chain) Interface(key string, i interface{}) Logger {
 	return c.Wrap(Interface(key, i))
 }
 
+func (c *chain) JSON(key string, value any) Logger {
+	return c.Wrap(JSON(key, value))
+}
+
 func (c *chain) Err(err error) Logger {
 	if err == nil {
 		return c

pkg/logging/wrap.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 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.
@@ -21,6 +21,7 @@
 package logging
 
 import (
+	"encoding/json"
 	"time"
 
 	"github.com/rs/zerolog"
@@ -97,3 +98,13 @@ func Dur(key string, dur time.Duration) Wrap {
 		return in.Dur(key, dur)
 	}
 }
+
+func JSON(key string, item any) Wrap {
+	return func(in *zerolog.Event) *zerolog.Event {
+		data, err := json.Marshal(item)
+		if err != nil {
+			return in
+		}
+		return in.Str(key, string(data))
+	}
+}