fix: make progressive batch send cleanup unconditional#1099
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR fixes progressive migration scheduling so that a failure to enqueue a batch (RunMigrationsOnTenants.batchSend) no longer prevents queue cleanup/reordering. Instead, enqueue failures are handled inside the batch handler: tenants that would have been marked completed are made retryable again, cleanup always runs, and the failure is logged.
Changes:
- Wrap
RunMigrationsOnTenants.batchSendin atry/catchto keep the flush/drain flow non-fatal and make cleanup unconditional. - On
batchSendfailure, move would-be-completed tenants into the retryable set and log the enqueue error. - Update/add tests to reflect the new behavior (flush resolves, correct logging, and correct queue reordering on enqueue failure).
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/internal/database/migrations/progressive.ts | Catch batchSend failures, re-queue tenants appropriately, and ensure cleanup/reordering runs regardless of enqueue success. |
| src/internal/database/migrations/progressive.test.ts | Adjust expectations to the new non-throwing behavior and add coverage for ordering/dropping behavior when batchSend fails. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Coverage Report for CI Build 25678144436Coverage decreased (-0.03%) to 74.261%Details
Uncovered ChangesNo uncovered changes found. Coverage Regressions3 previously-covered lines in 2 files lost coverage.
Coverage Stats💛 - Coveralls |
Signed-off-by: ferhat elmas <elmas.ferhat@gmail.com>
4c65bd0 to
af84eb1
Compare
fenos
approved these changes
May 11, 2026
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.
What kind of change does this PR introduce?
Bug fix
What is the current behavior?
Failure to send progressive batch can prevent cleanup.
What is the new behavior?
Make cleanup unconditional while marking completed as retryable again. It updates the shape of batch to make progress.
Additional context
Add any other context or screenshots.