Ignore stale executor success when TI is queued after defer#68741
Merged
uranusjr merged 12 commits intoJul 2, 2026
Merged
Conversation
boring-cyborg
Bot
added
the
area:Scheduler
goingforstudying-ctrl
force-pushed
the
fix/stale-success-queued-after-defer
branch
from
eed2ad5 to
2e53123
Compare
shahar1
previously requested changes
Jun 19, 2026
shahar1
left a comment
shahar1
left a comment
Contributor
There was a problem hiding this comment.
PR title shouldn't use conventional commit style, please fix it as well.
goingforstudying-ctrl
force-pushed
the
fix/stale-success-queued-after-defer
branch
4 times, most recently
from
75126b1 to
b290d48
Compare
Contributor
Author
|
Thanks for the review. I updated the commit message to remove the conventional commit style from the PR title as requested. Let me know if anything else needs adjustment. |
goingforstudying-ctrl
force-pushed
the
fix/stale-success-queued-after-defer
branch
3 times, most recently
from
26f4b79 to
021cf9c
Compare
goingforstudying-ctrl
changed the title
goingforstudying-ctrl
force-pushed
the
fix/stale-success-queued-after-defer
branch
from
021cf9c to
2f2f410
Compare
Contributor
Author
|
Fixed the PR title to remove conventional commit style. Let me know if anything else needs adjustment. |
goingforstudying-ctrl
force-pushed
the
fix/stale-success-queued-after-defer
branch
from
2f2f410 to
8b08e8a
Compare
goingforstudying-ctrl
force-pushed
the
fix/stale-success-queued-after-defer
branch
12 times, most recently
from
f6cd92c to
cc4b4a9
Compare
goingforstudying-ctrl
force-pushed
the
fix/stale-success-queued-after-defer
branch
14 times, most recently
from
a14ee0e to
14d034b
Compare
shahar1
approved these changes
Jun 28, 2026
shahar1
left a comment
shahar1
left a comment
Contributor
There was a problem hiding this comment.
LGTM.
@goingforstudying-ctrl please do not rebase onto main - just let the CI run and one of the maintainers will merge it once it passes succesfully.
When a task is deferred and later rescheduled into QUEUED state before the scheduler processes a stale SUCCESS event from the executor, the scheduler should ignore the stale success rather than incorrectly marking the task as succeeded. - Add guard in _process_executor_events to check current TI state - Add test for stale success after defer -> queued transition Fixes apache#67287
Member
|
Please stop merging main. This PR will never be merged if you keep doing this. |
|
Awesome work, congrats on your first merged pull request! You are invited to check our Issue Tracker for additional contributions. |
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
3 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.
Fixes a race where the trigger resumes a deferred task to
queued(rather thanscheduled) before the scheduler processes the executor SUCCESS from the worker defer exit. The scheduler then treatedqueuedvs executorsuccessas a state mismatch and failed the TI (#67287).The fix for #66374 (#66431) added handling for the
scheduledvariant. Under load the trigger may reschedule into eitherqueuedorscheduleddepending on scheduler loop timing, so both states must be treated as stale defer-exit events whennext_methodis set.Changes:
ti_requeuedcondition inprocess_executor_eventsto includeTaskInstanceState.QUEUEDtest_process_executor_events_stale_success_when_queued_after_defer(positive + negative withoutnext_method)67287.bugfix.rstTesting: