Repository navigation
fix(scheduler): preserve catch-up and retry overdue work - #6855
Merged
M4n5ter merged 3 commits intoNov 13, 2026
Merged
Conversation
Fixes apache#6827 Generated-by: OpenAI Codex
Generated-by: OpenAI Codex
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
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
Fixes #6827 on
rust-preview.Misfire::Latest, including one-shot tasks. A trigger due exactly at resume time remains claimable; pending fires retain their identity.Verification
Tested on macOS 26.5.2, Rust 1.99.1, based on
7d572089b. The locally installed development build contains this patch.cargo test --locked -p maka-scheduler --lib: 8 passed. The new overdue-resume regressions also failed against the original policy source in an isolated harness.cargo test --locked -p maka-agent-native --lib scheduler::: 2 passed, covering deadline crossing and bounded retry wakes. Deadline crossing is a deterministic unit test, not a desktop timing reproduction.producer_reopentest executable and ran itsscheduler_cases with runtimeCARGO_BIN_EXE_makapointing to the installed fixed binary: 3 passed, 0 failed, 54.55 seconds:The retry test temporarily moves an isolated workspace directory, observes an unexecuted pending fire, restores the same directory without a Host mutation, and verifies automatic admission with the original fire ID. It also exercises cold-reopen deduplication. Tests use temporary data and a loopback model fixture, not production credentials.
just build: passed; installed app signature verification and desktop launch passed.cargo fmt -p maka-scheduler -p maka-agent-native -p maka-cli --check,git diff --check, andnode scripts/ci.mjs check licenses: passed.just checkand all reverse-dependent suites were not run locally; the focused tests above are the local evidence. A merge-tree check againstrust-previewatd68c10f60is conflict-free; the installed build was not rebased onto those later upstream changes.AI use
Tool(s) and scope: OpenAI Codex assisted with implementation, regression tests, local build and verification, and this description. The commit includes its
Generated-bytrailer.Checklist
Does this PR entail a change in behavior?