unit: add jobs that were skipped because of ratelimit back to run_queue#21543
Merged
yuwata merged 1 commit intosystemd:mainfrom Nov 29, 2021
Merged
Conversation
Assumption in edc027b was that job we first skipped because of active ratelimit is still in run_queue. Hence we trigger the queue and dispatch it in the next iteration. Actually we remove jobs from run_queue in job_run_and_invalidate() before we call unit_start(). Hence if we want to attempt to run the job again in the future we need to add it back to run_queue. Fixes systemd#21458
Member
Author
|
This is a dumbed down version of #21524. It's the original patch from @msekletar but adds no extra state, and rather adds too much to the run queue than trying to optimize here too much. |
bluca
approved these changes
Nov 27, 2021
Member
bluca
left a comment
There was a problem hiding this comment.
lgtm, but we should wait until ubuntu CI's infra is back online
Contributor
|
LGTM |
Member
|
@poettering looks like Ubuntu CIs are back in business - could you do a re-push to trigger them? |
Member
no need, retriggered them manually |
Member
|
(ignore focal-i386, I triggered it by mistake, it doesn't exist anymore) |
Member
|
Looks reasonable, but for this one, let's wait for the CI to finish. So far it looks good. |
Member
|
All CIs are green (except for focal-i386)! Merging. |
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
6 participants
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.
Assumption in edc027b was that job we first skipped because of active
ratelimit is still in run_queue. Hence we trigger the queue and dispatch
it in the next iteration. Actually we remove jobs from run_queue in
job_run_and_invalidate() before we call unit_start(). Hence if we want
to attempt to run the job again in the future we need to add it back
to run_queue.
Fixes #21458