sweepbatcher: persist confirmed batches atomically #1044
+347
−20
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
Fixes a crash window where handleConf updated the batch row to confirmed but failed before marking sweeps complete, so re-added sweeps spawned a duplicate batch or kept retrying. Batch confirmation and sweep completion are now persisted inside a single DB transaction ConfirmBatchWithSweeps, and handleConf uses the helper to atomically store the batch and the set of confirmed sweeps. Added TestSweepBatcherConfirmedBatchIncompleteSweeps that runs against the real loopdb backend, injects a failure mid-transaction, and verifies the database never ends up with confirmed=true batches paired with completed=false sweeps.
hieblmi
reviewed
Nov 26, 2025
Collaborator
hieblmi
left a comment
hieblmi
left a comment
There was a problem hiding this comment.
The change LGTM!
Could we just check that this couldn't happen in other places where we call b.persist(ctx)?
| "purged swaps: %v. Saving the batch and sweeps to DB", | ||
| confirmedSweeps, purgedSweeps, purgedSwaps) | ||
|
|
||
| if err := b.persistConfirmedBatch(ctx, dbConfirmed); err != nil { |
Collaborator
There was a problem hiding this comment.
Nice, now both batch and sweeps are persisted at the same time!
Can we make sure that in other places where we call b.persist(ctx) there doesn't arise this discrepancy?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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 crash window where
handleConfupdated the batch row to confirmed but failed before marking sweeps complete, so re-added sweeps spawned a duplicate batch or kept retrying. Batch confirmation and sweep completion are now persisted inside a single DB transactionConfirmBatchWithSweeps, andhandleConfuses the helper to atomically store the batch and the set of confirmed sweeps.Added
TestSweepBatcherConfirmedBatchIncompleteSweepsthat runs against the realloopdbbackend, injects a failure mid-transaction, and verifies the database never ends up with confirmed=true batches paired with completed=false sweeps.Pull Request Checklist
release_notes.mdif your PR contains major features, breaking changes or bugfixes