Skip to content

🐛 Priorityqueue: Don't block on Get when queue is shutdown #3243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 26, 2025
Merged

🐛 Priorityqueue: Don't block on Get when queue is shutdown #3243

merged 1 commit into from
Jun 26, 2025
+27 −0

Conversation

dongjiang1989
Copy link
Contributor

Close #3239

Fix priority queue GetWithPriority blocking when the priority queue is shut down

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 25, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @dongjiang1989. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 25, 2025
@dongjiang1989 dongjiang1989 reopened this Jun 25, 2025
@dongjiang1989 dongjiang1989 changed the title Fix: fix priority queue blocking 🐛Fix priority queue blocking Jun 25, 2025
@alvaroaleman
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 25, 2025
alvaroaleman
alvaroaleman reviewed Jun 25, 2025
View reviewed changes
pkg/controller/priorityqueue/priorityqueue.go Outdated
@@ -277,6 +277,13 @@ func (w *priorityqueue[T]) GetWithPriority() (_ T, priority int, shutdown bool)
w.waiters.Add(1)

w.notifyItemOrWaiterAdded()

// ref: https://github.com/kubernetes-sigs/controller-runtime/issues/3239
if w.shutdown.Load() == true {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to compare booleans:

Suggested change
if w.shutdown.Load() == true {
if w.shutdown.Load() {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @alvaroaleman
Fixed
Please re-check it

@dongjiang1989
fix priority queue
342e14d 
Signed-off-by: dongjiang <[email protected]>
@dongjiang1989
Copy link
Contributor Author

/test pull-controller-runtime-test

@alvaroaleman alvaroaleman changed the title 🐛Fix priority queue blocking 🐛 Priorityqueue: Don't block on Get when queue is shutdown Jun 26, 2025
alvaroaleman
alvaroaleman approved these changes Jun 26, 2025
View reviewed changes
Copy link
Member

@alvaroaleman alvaroaleman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 26, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman, dongjiang1989

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 814d59ddf9c39680dfc31eac2d99f146aaf31d6f

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 26, 2025
@alvaroaleman
Copy link
Member

/cherrypick release-v0.21

@k8s-infra-cherrypick-robot
Copy link

@alvaroaleman: once the present PR merges, I will cherry-pick it on top of release-v0.21 in a new PR and assign it to you.

In response to this:

/cherrypick release-v0.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot merged commit cec6556 into kubernetes-sigs:main Jun 26, 2025
14 checks passed
@k8s-infra-cherrypick-robot
Copy link

@alvaroaleman: cannot checkout release-v0.21: error checking out "release-v0.21": exit status 1 error: pathspec 'release-v0.21' did not match any file(s) known to git

In response to this:

/cherrypick release-v0.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@alvaroaleman
Copy link
Member

/cherrypick release-0.21

@k8s-infra-cherrypick-robot
Copy link

@alvaroaleman: new pull request created: #3245

In response to this:

/cherrypick release-0.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Jun 26, 2025
Merged
@dongjiang1989 dongjiang1989 deleted the fix-queuepriority branch June 27, 2025 01:27
@dongjiang1989 dongjiang1989 restored the fix-queuepriority branch June 27, 2025 01:37
@dongjiang1989 dongjiang1989 deleted the fix-queuepriority branch June 27, 2025 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alvaroaleman alvaroaleman alvaroaleman approved these changes

@inteon inteon Awaiting requested review from inteon

@sbueringer sbueringer Awaiting requested review from sbueringer

Assignees

@alvaroaleman alvaroaleman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Get from priority queue might get stuck when the priority queue is shut down
4 participants
@dongjiang1989 @k8s-ci-robot @alvaroaleman @k8s-infra-cherrypick-robot