fix(controller): set pod name version annotation when no lock #12965
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
- `setWfPodNamesAnnotation` was added to the `Unknown` phase check a few lines below this, but not to this line - these are the two places where `Unknown` is handled - without this, the annotation wouldn't be set if the workflow couldn't grab a lock, creating a mismatch when using synchronization - also simplify the conditional into one with an `&&` rather than nesting - reducing nesting reduces code complexity - slightly simplify `setWfPodNamesAnnotation` as well Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
agilgur5
added
the
area/synchronization
This was referenced Apr 22, 2024
tczhao
reviewed
May 1, 2024
juliev0
reviewed
May 10, 2024
| phase := woc.wf.Status.Phase | ||
| if phase == wfv1.WorkflowUnknown { | ||
| phase = wfv1.WorkflowPending | ||
| setWfPodNamesAnnotation(woc.wf) |
There was a problem hiding this comment.
hate to be picky but wondering if we could just set this in one place at the top of the function? like maybe logic like "if annotation isn't set, then set it". Is there any reason it should ever not be set? That would handle any future cases where we preemptively exit for whatever reason.
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.
Fixes #10178, Fixes #6982 (comment), Fixes #10735 (comment)
Partly addresses #6356 (comment), but not entirely, as the PDB is a more complicated case. Will file a separate issue for that. EDIT: filed #12966
Motivation
setWfPodNamesAnnotationwas added to theUnknownphase check a few lines below this, but not to this lineUnknownis handledModifications
add
setWfPodNamesAnnotationto the otherUnknownphase block&&rather than nestingslightly simplify
setWfPodNamesAnnotationas wellVerification
Tested with the same Workflow from #12966, creating two in quick succession (one waits on the mutex lock from the other),
workflows.argoproj.io/pod-name-format: v2annotations present in both.Should probably add a case to
operator_concurrency_test.go, TBD