Skip to content
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

🐛 Bugfixes for priority queue #3060

Merged
merged 2 commits into from
Jan 8, 2025
Merged

🐛 Bugfixes for priority queue #3060

merged 2 commits into from
Jan 8, 2025

Conversation

alvaroaleman
Copy link
Member

@alvaroaleman alvaroaleman commented Jan 7, 2025 •
edited
Loading

This change:

  • addresses Stefans review comments from the original PR
  • fixes a bug in the metrics where we always included items that are not ready yet - This is incorrect, metrics are only implemented on the basequeue in upstream, meaning they are only emitted for items that are ready. The impact of this was for example an incorrect queue_depth metric.
  • fixes an issue where we might panic due to to manipulating the btree while iterating it

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 7, 2025
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 7, 2025
@alvaroaleman alvaroaleman force-pushed the pq-2 branch 2 times, most recently from 8245064 to 6e71ef7 Compare January 7, 2025 01:05
@alvaroaleman alvaroaleman added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jan 7, 2025
@alvaroaleman alvaroaleman mentioned this pull request Jan 7, 2025
Closed
@alvaroaleman alvaroaleman changed the title 🐛 Address review comments and fix metrics in priority queue 🐛 Bugfixes for priority queue Jan 7, 2025
@alvaroaleman alvaroaleman removed the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jan 7, 2025
@sbueringer sbueringer mentioned this pull request Jan 7, 2025
Open
4 tasks
@sbueringer
Copy link
Member

/lgtm
/approve

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 7, 2025
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 7, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: e81e8c3e7f16910468bd511bea068bf0c604c5fa

vincepri
vincepri reviewed Jan 7, 2025
View reviewed changes
pkg/controller/controller.go Outdated Show resolved Hide resolved
pkg/controller/controller.go Outdated Show resolved Hide resolved
alvaroaleman and others added 2 commits January 7, 2025 14:40
@alvaroaleman
🐛 Address review comments and fix metrics in priority queue
72a4107 
This change addresses Stefans review comments from the original PR and
fixes a bug in the metrics where we always included items that are not
ready yet - This is incorrect, metrics are only implemented on the
[basequeue][0] in upstream, meaning they are only emitted for items that
are ready. The impact of this was for example an incorrect queue_depth
metric.

[0]: https://github.com/kubernetes/kubernetes/blob/b1cb471982b74c13c26dbcc0f4e1b5ae92ea47e6/staging/src/k8s.io/client-go/util/workqueue/queue.go#L157
@alvaroaleman @sbueringer
Fix issue with manipulating the tree in Ascend
462341c 
Co-authored-by: Stefan Bueringer <[email protected]>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 7, 2025
@k8s-ci-robot
Copy link
Contributor

@alvaroaleman: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-controller-runtime-apidiff 462341c link false /test pull-controller-runtime-apidiff

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@sbueringer
Copy link
Member

Thx!

/lgtm
/approve
/hold cancel

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jan 8, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 1db030293532eed8205d44abce3ea64de3367201

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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:
  • OWNERS [alvaroaleman,sbueringer]

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 k8s-ci-robot merged commit c80ea33 into kubernetes-sigs:main Jan 8, 2025
8 of 9 checks passed
@alvaroaleman alvaroaleman deleted the pq-2 branch January 8, 2025 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vincepri vincepri vincepri left review comments

@FillZpp FillZpp Awaiting requested review from FillZpp

@sbueringer sbueringer Awaiting requested review from sbueringer

Assignees

@sbueringer sbueringer

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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@alvaroaleman @sbueringer @k8s-ci-robot @vincepri