From d91d50f696d2310a0c7dd7903e5a063269036179 Mon Sep 17 00:00:00 2001 From: Scott Seago Date: Wed, 13 Aug 2025 14:23:45 -0400 Subject: [PATCH] feat: Add concurrentBackups to backupQueueReconciler Co-authored-by: aider (gemini/gemini-2.5-pro) Signed-off-by: Scott Seago --- pkg/cmd/server/server.go | 1 + pkg/controller/backup_queue_controller.go | 13 ++++++++----- pkg/controller/backup_queue_controller_test.go | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index bbfa70150..83203ca06 100644 --- a/pkg/cmd/server/server.go +++ b/pkg/cmd/server/server.go @@ -915,6 +915,7 @@ func (s *server) runControllers(defaultVolumeSnapshotLocations map[string]string s.mgr.GetClient(), s.mgr.GetScheme(), s.logger, + s.config.ConcurrentBackups, ).SetupWithManager(s.mgr); err != nil { s.logger.Fatal(err, "unable to create controller", "controller", constant.ControllerBackupQueue) } diff --git a/pkg/controller/backup_queue_controller.go b/pkg/controller/backup_queue_controller.go index 8ff5571f1..467609f5d 100644 --- a/pkg/controller/backup_queue_controller.go +++ b/pkg/controller/backup_queue_controller.go @@ -30,8 +30,9 @@ import ( // backupQueueReconciler reconciles a Backup object type backupQueueReconciler struct { client.Client - Scheme *runtime.Scheme - logger logrus.FieldLogger + Scheme *runtime.Scheme + logger logrus.FieldLogger + concurrentBackups int } // NewBackupQueueReconciler returns a new backupQueueReconciler @@ -39,11 +40,13 @@ func NewBackupQueueReconciler( client client.Client, scheme *runtime.Scheme, logger logrus.FieldLogger, + concurrentBackups int, ) *backupQueueReconciler { return &backupQueueReconciler{ - Client: client, - Scheme: scheme, - logger: logger, + Client: client, + Scheme: scheme, + logger: logger, + concurrentBackups: concurrentBackups, } } diff --git a/pkg/controller/backup_queue_controller_test.go b/pkg/controller/backup_queue_controller_test.go index 159163300..70e315123 100644 --- a/pkg/controller/backup_queue_controller_test.go +++ b/pkg/controller/backup_queue_controller_test.go @@ -47,7 +47,7 @@ func TestBackupQueueReconciler(t *testing.T) { logger := logrus.New() log := logger.WithField("controller", "backup-queue-test") - r := NewBackupQueueReconciler(fakeClient, scheme, log) + r := NewBackupQueueReconciler(fakeClient, scheme, log, 1) req := ctrl.Request{ NamespacedName: types.NamespacedName{ Namespace: "velero",