[Bugfix] Fix agency timeout (#1343)

Author: ajanikow

pkg/apis/deployment/v1/sync_external_access_spec.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 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/debug_package/cli/cli.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 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/agency/loader.go

@@ -26,6 +26,7 @@ import (
 	"time"
 
 	agencyCache "github.com/arangodb/kube-arangodb/pkg/deployment/agency/cache"
+	"github.com/arangodb/kube-arangodb/pkg/util/globals"
 )
 
 func getLoader[T interface{}]() agencyCache.StateLoader[T] {
@@ -102,19 +103,29 @@ func (s *simpleStateLoader[T]) Refresh(ctx context.Context, discovery agencyCach
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	conn, err := discovery.Discover(ctx)
+	lctx, cancel := globals.GetGlobalTimeouts().Agency().WithTimeout(ctx)
+	defer cancel()
+
+	conn, err := discovery.Discover(lctx)
 	if err != nil {
 		return err
 	}
 
-	cfg, err := GetAgencyConfig(ctx, conn)
+	cctx, cancel := globals.GetGlobalTimeouts().Agency().WithTimeout(ctx)
+	defer cancel()
+
+	cfg, err := GetAgencyConfig(cctx, conn)
 	if err != nil {
 		return err
 	}
 
 	if !s.valid || s.index != cfg.CommitIndex {
 		// Full reload
-		state, err := GetAgencyState[T](ctx, conn)
+
+		sctx, cancel := globals.GetGlobalTimeouts().Agency().WithTimeout(ctx)
+		defer cancel()
+
+		state, err := GetAgencyState[T](sctx, conn)
 		if err != nil {
 			return err
 		}

pkg/deployment/deployment.go

@@ -180,9 +180,6 @@ func (d *Deployment) RefreshAgencyCache(ctx context.Context) (uint64, error) {
 
 	if info := d.currentObject.Status.Agency; info != nil {
 		if size := info.Size; size != nil {
-			lCtx, c := globals.GetGlobalTimeouts().Agency().WithTimeout(ctx)
-			defer c()
-
 			rsize := int(*size)
 
 			clients := agency.Connections{}
@@ -195,7 +192,7 @@ func (d *Deployment) RefreshAgencyCache(ctx context.Context) (uint64, error) {
 				clients[m.ID] = a
 			}
 
-			return d.agencyCache.Reload(lCtx, rsize, clients)
+			return d.agencyCache.Reload(ctx, rsize, clients)
 		}
 	}
 

pkg/deployment/resources/logger.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 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.