[Backport release-1.29] Applier manager improvements #5303
Merged
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
The map is only ever used in the loop to create and remove stacks, so it doesn't need to be stored in the struct. This ensures that there can't be any racy concurrent accesses to it. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit ba547ed) (cherry picked from commit c6dba06) (cherry picked from commit 05a768b)
The only reason these channels get closed is if the watcher itself gets closed. This happens only when the method returns, which in turn only happens when the context is done. In this case, the loop has already exited without a select on a potentially closed channel. So the branches that checked for closed channels were effectively unreachable during runtime. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit db5e0d2) (cherry picked from commit 102b7e3) (cherry picked from commit b9fd9bd)
Rename cancelWatcher to stop and wait until the newly added stopped channel is closed. Also, add a stopped channel to each stack to do the same for each stack-specific goroutine. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit 402c728) (cherry picked from commit dbc286c) (cherry picked from commit 95e5ec0)
Cancel the contexts with a cause. Add this cause to the log statements when exiting loops. Rename bundlePath to bundleDir to reflect the fact that it is a directory, not a file. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit edb105c) (cherry picked from commit a22902b) (cherry picked from commit 394198b)
Exit the loop on error and restart it after a one-minute delay to allow it to recover in a new run. Also replace the bespoke retry loop for stacks with the Kubernetes client's wait package. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit 404c6cf) (cherry picked from commit 3058460) (cherry picked from commit 87ce481)
Seems to be a remnant from the past. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit c2beea7) (cherry picked from commit 4b2efbe) (cherry picked from commit 04ba246)
twz123
changed the title
jnummelin
approved these changes
Dec 10, 2024
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.
Automated backport to
release-1.29, triggered by a label in #5172.See #5171 #5062 #5122.