Fix abort transfer resharding idempotency#9215
Merged
Merged
Conversation
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
tellet-q
approved these changes
May 28, 2026
ffuugoo
approved these changes
May 29, 2026
timvisee
added a commit
that referenced
this pull request
Jun 3, 2026
* Abort resharding before we abort transfer * Test resharding-down abort converges when a peer is killed mid-abort --------- Co-authored-by: tellet-q <[email protected]>
Merged
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
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.
The consensus operation for aborting resharding did not behave in an idempotent manner.
I attempted to implement this in #8917, but it turns out there's a second code path that conflicts with that change. This second path also (incorrectly) aborted the transfer before resharding, breaking consensus WAL replay.
This simply reorders this second place so that we always abort resharding before the transfer is aborted.
A test is included to assert correct behavior. The test fails without this change.
I'd consider this a hotfix. I'd rather remove the second path for aborting the transfer but it isn't immediately obvious to apply that because we call it from multiple places with different contexts. This hotfix is good enough to be merged and released without side effects.
All Submissions:
devbranch (notmaster) and my branch was created fromdev.Changes to Core Features: