Conversation
Signed-off-by: Pavel Okhlopkov <pavel.okhlopkov@flant.com>
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a potential deadlock issue by replacing queue iteration and filtering methods with their snapshot equivalents and updating function signatures to support context-based iteration.
- Replace
q.Iterate()withq.IterateSnapshot()to avoid holding locks during iteration - Replace
q.Filter()withq.DeleteFunc()for safer task removal operations - Update dependency version and add context parameter to queue iteration methods
Reviewed Changes
Copilot reviewed 8 out of 9 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| pkg/task/service/converge.go | Replace Iterate with IterateSnapshot for counting tasks |
| pkg/task/queue/queue.go | Replace Iterate with IterateSnapshot and Filter with DeleteFunc |
| pkg/module_manager/module_manager.go | Replace Iterate with IterateSnapshot for task enumeration |
| pkg/addon-operator/queue_test.go | Update test code to use IterateSnapshot |
| pkg/addon-operator/queue.go | Replace Iterate with IterateSnapshot and Filter with DeleteFunc |
| pkg/addon-operator/operator_test.go | Add prometheus registry setup and use IterateSnapshot |
| pkg/addon-operator/metrics.go | Add context parameter to queue iteration method |
| go.mod | Update shell-operator dependency and prometheus client |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
This file contains hidden or 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
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.
Overview
Replaced synchronization primitives with atomics to eliminate deadlock potential
Introduced a thread-safe status management system with TaskQueueStatus
Added deadlock prevention mechanisms in queue operations
What this PR does / why we need it
Special notes for your reviewer