fix: Fix calculating SelfHealBackOff delay when exceeding maximum (#2…

…0976) (#20978) * test: fix TestSelfHealExponentialBackoff to test exceeding Backoff.Cap Signed-off-by: Michal Ryšavý <[email protected]> * fix: fix calculating SelfHealBackOff delay when exceeding maximum Signed-off-by: Michal Ryšavý <[email protected]> --------- Signed-off-by: Michal Ryšavý <[email protected]> Co-authored-by: Michal Ryšavý <[email protected]>
argoproj · Dec 19, 2024 · 8841b0d · 8841b0d
1 parent 6b57b16
commit 8841b0d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/controller/appcontroller.go b/controller/appcontroller.go
@@ -2236,7 +2236,8 @@ func (ctrl *ApplicationController) shouldSelfHeal(app *appv1.Application) (bool,
 		backOff := *ctrl.selfHealBackOff
 		backOff.Steps = int(app.Status.OperationState.Operation.Sync.SelfHealAttemptsCount)
 		var delay time.Duration
-		for backOff.Steps > 0 {
+		steps := backOff.Steps
+		for i := 0; i < steps; i++ {
 			delay = backOff.Step()
 		}
 		if app.Status.OperationState.FinishedAt == nil {

diff --git a/controller/appcontroller_test.go b/controller/appcontroller_test.go
@@ -2514,7 +2514,7 @@ func TestSelfHealExponentialBackoff(t *testing.T) {
 	ctrl.selfHealBackOff = &wait.Backoff{
 		Factor:   3,
 		Duration: 2 * time.Second,
-		Cap:      5 * time.Minute,
+		Cap:      2 * time.Minute,
 	}
 
 	app := &v1alpha1.Application{
@@ -2552,6 +2552,21 @@ func TestSelfHealExponentialBackoff(t *testing.T) {
 		finishedAt:       nil,
 		expectedDuration: 18 * time.Second,
 		shouldSelfHeal:   false,
+	}, {
+		attempts:         4,
+		finishedAt:       nil,
+		expectedDuration: 54 * time.Second,
+		shouldSelfHeal:   false,
+	}, {
+		attempts:         5,
+		finishedAt:       nil,
+		expectedDuration: 120 * time.Second,
+		shouldSelfHeal:   false,
+	}, {
+		attempts:         6,
+		finishedAt:       nil,
+		expectedDuration: 120 * time.Second,
+		shouldSelfHeal:   false,
 	}}
 
 	for i := range testCases {