fix(store): reject cross-shard duplicates during standby restore - #3527
Merged
ykwd merged 1 commit intoAug 21, 2026
Merged
Conversation
982945902
requested review from
00fish0,
Icedcoco,
Libotry,
XucSh,
YiXR,
stmatengss and
ykwd
as code owners
August 19, 2026 06:52
ykwd
approved these changes
Aug 21, 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.
Summary
(tenant, key)already exists under the current metadata routingRoot cause
RestoreFromStandbySnapshot()checked only the shard selected by the incoming snapshot entry'sgroup_id. If an existing object was routed by its key or by another group, restore could insert duplicate metadata into a different shard.Tests
MasterServiceHATest.RestoreRejectsUngroupedObjectDuplicatedIntoAnotherShardMasterServiceHATest.RestoreRejectsGroupedObjectDuplicatedIntoAnotherGroupShardMasterServiceHATest.Restore*tests: 11 passedmaster_service_ha_test: 83 passed, 1 unrelated failure (MasterServiceBatchRecordE2ETest.PromotionCatchesUpToDurablePrefix) because the local build usedSTORE_USE_ETCD=OFF; tracked by [Bug]: HotStandbyService tests do not exercise claimed etcd behaviors #3496git diff --checkFixes #3398