fix(cron): prevent long-running scheduled scripts from running twice - #64365
Merged
Merged
Conversation
alt-glitch
added
type/bug
22 tasks
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.
Summary
Salvage of #63406 (CI blocked for first-time contributor). Keeps the run_claim alive for one-shot jobs while blocking script paths run (no_agent and pre-agent wake-gate scripts), preventing a second scheduler scan from dispatching the same job when the script outlives the claim TTL.
Sibling of #62002/#62014 (which added heartbeat for the agent path but missed the script paths).
Changes
cron/scheduler.py: adds_run_job_script_with_claim_heartbeat()— wraps_run_job_scriptwith a daemon-thread heartbeat for one-shot jobs with a claim owner. Usescontextvars.copy_context()to preserve scheduler-scoped ContextVar state. Captures the claim owner at dispatch time so a stale runner can't refresh a replacement owner's claim._run_job_scriptcalls in the no_agent path and the pre-agent wake-gate path.test_script_claim_heartbeat_keeps_job_alive_past_ttl,test_script_heartbeat_uses_captured_claim_owner,test_script_heartbeat_skips_recurring_jobs.Attribution
Cherry-picked from @morluto's #63406 with authorship preserved.
Validation
15 passed (3 new + 12 existing cron tests). ruff + py_compile clean.