fix: retryStrategy.Limit is now read properly for backoff strategy. Fixes #9170. #9213
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Dillen Padhiar <[email protected]>
Signed-off-by: Dillen Padhiar <[email protected]>
Signed-off-by: Dillen Padhiar <[email protected]>
tczhao
requested changes
Jul 25, 2022
test/e2e/retry_test.go
Outdated
| Then(). | ||
| ExpectWorkflow(func(t *testing.T, _ *metav1.ObjectMeta, status *wfv1.WorkflowStatus) { | ||
| assert.Equal(t, wfv1.WorkflowPhase("Failed"), status.Phase) | ||
| assert.Equal(t, "Max duration limit exceeded", status.Message) |
There was a problem hiding this comment.
I think you need to validate the number of retries since the issue is "string" limit does not get interpret correctly
There was a problem hiding this comment.
In this case, we could check the length of child nodes at the end of the run which should be 5 based on the backoff time.
| @@ -898,7 +898,7 @@ func (woc *wfOperationCtx) processNodeRetries(node *wfv1.NodeStatus, retryStrate | |||
| } | |||
|
|
|||
| // See if we have waited past the deadline | |||
| if time.Now().Before(waitingDeadline) && retryStrategy.Limit != nil && int32(len(node.Children)) <= retryStrategy.Limit.IntVal { | |||
| if time.Now().Before(waitingDeadline) && retryStrategy.Limit != nil && int32(len(node.Children)) <= int32(retryStrategy.Limit.IntValue()) { | |||
Signed-off-by: Dillen Padhiar <[email protected]>
tczhao
reviewed
Jul 28, 2022
| templates: | ||
| - name: main | ||
| retryStrategy: | ||
| limit: 10 |
There was a problem hiding this comment.
I should've pointed this out last time, since the error is with the intstring conversion maybe we should test both '10' and 10
There was a problem hiding this comment.
Will add a separate workflow to test this, good idea.
Signed-off-by: Dillen Padhiar <[email protected]>
tczhao
approved these changes
Jul 29, 2022
sarabala1979
approved these changes
Aug 1, 2022
terrytangyuan
pushed a commit
that referenced
this pull request
Aug 2, 2022
…ixes #9170. (#9213) * fix: retryStrategy.Limit is now read properly Signed-off-by: Dillen Padhiar <[email protected]> * test: add test case for backoff Signed-off-by: Dillen Padhiar <[email protected]> * chore: empty commit Signed-off-by: Dillen Padhiar <[email protected]> * test: update test case to check for certain amount of retries Signed-off-by: Dillen Padhiar <[email protected]> * test: added second case where limit is a string Signed-off-by: Dillen Padhiar <[email protected]>
|
am on v3.3.9 but backoff doesnt seem to apply any delays between retries |
juchaosong
pushed a commit
to juchaosong/argo-workflows
that referenced
this pull request
Nov 3, 2022
…ixes argoproj#9170. (argoproj#9213) * fix: retryStrategy.Limit is now read properly Signed-off-by: Dillen Padhiar <[email protected]> * test: add test case for backoff Signed-off-by: Dillen Padhiar <[email protected]> * chore: empty commit Signed-off-by: Dillen Padhiar <[email protected]> * test: update test case to check for certain amount of retries Signed-off-by: Dillen Padhiar <[email protected]> * test: added second case where limit is a string Signed-off-by: Dillen Padhiar <[email protected]> Signed-off-by: juchao <[email protected]>
reddymh
pushed a commit
to reddymh/argo-workflows
that referenced
this pull request
Jan 2, 2023
…ixes argoproj#9170. (argoproj#9213) * fix: retryStrategy.Limit is now read properly Signed-off-by: Dillen Padhiar <[email protected]> * test: add test case for backoff Signed-off-by: Dillen Padhiar <[email protected]> * chore: empty commit Signed-off-by: Dillen Padhiar <[email protected]> * test: update test case to check for certain amount of retries Signed-off-by: Dillen Padhiar <[email protected]> * test: added second case where limit is a string Signed-off-by: Dillen Padhiar <[email protected]> Signed-off-by: Reddy <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Dillen Padhiar [email protected]
Fixes #9170
Previously, this if statement always evaluated to false if you set a
LimitforRetryStrategyas theretryStrategy.Limit.IntValalways equaled 0. The appropriate way to get the integer value from aintstr.IntOrStringis to useIntValuewhich returns an int we cast toint32.