cherry-pick: Index backfills resume from their checkpoint and yield the event loop, so large tables converge (harper#2536) (conflicts → v5.2) - #2551
Merged
Conversation
Index backfills resume from their checkpoint and yield the event loop, so large tables converge (harper#2536)
…test's descriptor lookup The cherry-pick of PR #2539 onto v5.2 left conflict markers around runIndexing's new preamble: v5.2's signature takes no branchPath (branches are main-only), so the resolution keeps the three-parameter signature and every added helper (checkpoint rate limiting, flushIndexStores, resumeStartKey, per-put rejection tracking). The resulting diff against v5.2 is line-for-line identical to PR #2539's diff on main. indexRestartNumber.test.js's findDescriptor scanned the whole dbisDB, which the 'test' database shares across suites, so the new indexBackfillConvergence tables' own `tag` attribute was returned instead and two assertions failed. Scoped the scan to the table's key prefix, matching the fix already on main (#2258). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
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
1 participant
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.
Cherry-pick of PR #2539 onto `v5.2` produced conflicts on commit(s): `2e8171fa95598c2c9b6507176d80d8a364533e88`.
Resolve the conflict markers on branch `cherry-pick/v5.2/pr-2539` and merge this PR.
@claude please review branch `cherry-pick/v5.2/pr-2539` and suggest a patch that resolves the conflict markers (
<<<<<<</=======/>>>>>>>) introduced by cherry-picking PR #2539 onto `v5.2`. Post the suggested patch as a comment here — do not push.