Commit c2c9a265 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson

Fix excessive retry on snapshot reconcile

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com> (cherry picked from commit 4005600d) Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent dda9780f
...@@ -33,6 +33,13 @@ const ( ...@@ -33,6 +33,13 @@ const (
var ( var (
snapshotConfigMapName = version.Program + "-etcd-snapshots" snapshotConfigMapName = version.Program + "-etcd-snapshots"
errNotReconciled = errors.New("no nodes have reconciled ETCDSnapshotFile resources") 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 { type etcdSnapshotHandler struct {
...@@ -62,7 +69,7 @@ func (e *etcdSnapshotHandler) sync(key string, esf *apisv1.ETCDSnapshotFile) (*a ...@@ -62,7 +69,7 @@ func (e *etcdSnapshotHandler) sync(key string, esf *apisv1.ETCDSnapshotFile) (*a
err := e.reconcile() err := e.reconcile()
if err == errNotReconciled { if err == errNotReconciled {
logrus.Debugf("Failed to reconcile snapshot ConfigMap: %v, requeuing", err) 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, nil
} }
return nil, err return nil, err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment