sweepbatcher: handle batch shutdown during re-add #1042
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
Started from CI failure of TestSweepBatcherHandleSweepRace/loopdb [1] that surfaced ErrBatcherShuttingDown when the AddSweep loop caught a batch right as it finished. Reproduced via: go test ./sweepbatcher -run TestSweepBatcherHandleSweepRace/loopdb -cpu=12,4,8 -count=1 Discovered that handleSweeps treated ErrBatchShuttingDown from batch.addSweeps as fatal, so the batcher exited even though the sweep was already confirmed. Fixed by treating that error as "batch already done" so we fall through to the persisted status/monitorSpend path, and added a regression test that deterministically simulates the shutdown window. New regression test added: go test ./sweepbatcher -run TestSweepBatcherHandleBatchShutdown [1] https://github.com/lightninglabs/loop/actions/runs/19282552307/job/55136597881?pr=1041
hieblmi
approved these changes
Nov 12, 2025
Collaborator
hieblmi
left a comment
hieblmi
left a comment
There was a problem hiding this comment.
I have one question, other than that looks good to me!
| if batch.sweepExists(sweep.outpoint) { | ||
| accepted, err := batch.addSweeps(ctx, sweeps) | ||
| if err != nil && !errors.Is(err, ErrBatchShuttingDown) { | ||
| if errors.Is(err, ErrBatchShuttingDown) { |
Collaborator
There was a problem hiding this comment.
IIUC there is no way that addSweeps still adds the sweep and returns ErrBatchShuttingDown, right?
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.
Started from CI failure of
TestSweepBatcherHandleSweepRace/loopdbthat surfacedErrBatcherShuttingDownwhen theAddSweeploop caught a batch right as it finished. Reproduced via:Discovered that
handleSweepstreatedErrBatchShuttingDownfrombatch.addSweepsas fatal, so the batcher exited even though the sweep was already confirmed. Fixed by treating that error as "batch already done" so we fall through to the persisted status/monitorSpendpath, and added a regression test thatdeterministically simulates the shutdown window.
New regression test added:
Pull Request Checklist
release_notes.mdif your PR contains major features, breaking changes or bugfixes