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.

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

(#1968528) sd-event ratelimiting followups #198

Merged
merged 6 commits into from Jul 21, 2021
Merged

(#1968528) sd-event ratelimiting followups #198

merged 6 commits into from Jul 21, 2021

Conversation

msekletar
Copy link
Member

No description provided.

poettering and others added 6 commits July 13, 2021 12:22
Instead of ordering non-pending before pending we should order
"non-pending OR ratelimited" before "pending AND not-ratelimited".
This fixes a bug where ratelimited events were ordered at the end of the
priority queue and could be stuck there for an indeterminate amount of
time.

(cherry picked from commit 81107b8)

Related: #1968528
(cherry picked from commit 7e2bf71)

Related: #1968528
(cherry picked from commit 06e1314)

Related: #1968528
(cherry picked from commit a595fb5)

Related: #1968528
…ource type

But it does nothing for an event source which is neither a timer nor
ratelimited.

(cherry picked from commit 5c08c7a)

Related: #1968528
Before 81107b8, the compare functions
for the latest or earliest prioq did not handle ratelimited flag.
So, it was ok to not reshuffle the time prioq when changing the flag.

But now, those two compare functions also compare the source is
ratelimited or not. So, it is necessary to reshuffle the time prioq
after changing the ratelimited flag.

Hopefully fixes #19903.

(cherry picked from commit 2115b9b)

Related: #1968528
@msekletar msekletar added this to the RHEL-8.5 milestone Jul 21, 2021
@systemd-rhel-bot systemd-rhel-bot added pr/needs-ci Formerly needs-ci pr/needs-review Formerly needs-review and removed pr/needs-ci Formerly needs-ci labels Jul 21, 2021
Copy link
Member

@dtardon dtardon left a comment

Choose a reason for hiding this comment

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

LGTM

@systemd-rhel-bot systemd-rhel-bot removed the pr/needs-review Formerly needs-review label Jul 21, 2021
@systemd-rhel-bot systemd-rhel-bot merged commit 1ce5187 into redhat-plumbers:master Jul 21, 2021
@mergify mergify bot added the pr/needs-ci Formerly needs-ci label Jan 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/needs-ci Formerly needs-ci released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants