From 4005600d4e3ebf429632504f21deb893ae28893c Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Tue, 30 Jan 2024 23:33:39 +0000 Subject: [PATCH] Fix excessive retry on snapshot reconcile Signed-off-by: Brad Davidson --- pkg/etcd/snapshot_controller.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/etcd/snapshot_controller.go b/pkg/etcd/snapshot_controller.go index 295f0117e4..d4b22755e0 100644 --- a/pkg/etcd/snapshot_controller.go +++ b/pkg/etcd/snapshot_controller.go @@ -33,6 +33,13 @@ const ( var ( snapshotConfigMapName = version.Program + "-etcd-snapshots" errNotReconciled = errors.New("no nodes have reconciled ETCDSnapshotFile resources") + reconcileBackoff = wait.Backoff{ + Steps: 9, + Duration: 10 * time.Millisecond, + Factor: 3.0, + Jitter: 0.1, + Cap: 30 * time.Second, + } ) type etcdSnapshotHandler struct { @@ -62,7 +69,7 @@ func (e *etcdSnapshotHandler) sync(key string, esf *apisv1.ETCDSnapshotFile) (*a err := e.reconcile() if err == errNotReconciled { logrus.Debugf("Failed to reconcile snapshot ConfigMap: %v, requeuing", err) - e.snapshots.Enqueue(key) + e.snapshots.EnqueueAfter(key, reconcileBackoff.Step()) return nil, nil } return nil, err