sweepbatcher: harden AddSweep race handling #1012
Merged
+302
−41
Conversation
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
Re-ordered the cleanup in handleSweeps so completed batches are deleted only after any re-add attempt, preventing a finished batch from being dropped before it can absorb the re-add. Added a fresh status/parent-batch lookup inside handleSweeps so the logic now reacts to swaps that complete between AddSweep and the event-loop handler; fully confirmed sweeps are routed straight to monitorSpendAndNotify instead of spawning a duplicate batch. Added regression test testSweepBatcherHandleSweepRace, which replays the AddSweep/confirmation race and verifies that only the original batch remains and the sweep keeps its parent assignment.
starius
force-pushed
the
sweepbatcher-close-add-race
branch
from
7de89c3 to
d90b4c2
Compare
djkazic
approved these changes
Oct 3, 2025
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.
Re-ordered the cleanup in handleSweeps so completed batches are deleted only after any re-add attempt, preventing a finished batch from being dropped before it can absorb the re-add.
Added a fresh status/parent-batch lookup inside handleSweeps so the logic now reacts to swaps that complete between AddSweep and the event-loop handler; fully confirmed sweeps are routed straight to monitorSpendAndNotify instead of spawning a duplicate batch.
Added regression test testSweepBatcherHandleSweepRace, which replays the AddSweep/confirmation race and verifies that only the original batch remains and the sweep keeps its parent assignment.
Pull Request Checklist
release_notes.mdif your PR contains major features, breaking changes or bugfixes