Fix snapshot restore with new shard key format #6202
Merged
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
timvisee
commented
Mar 19, 2025
Comment on lines
-187
to
+189
| let shard_key_mapping: ShardKeyMapping = read_json(&mapping_path)?; | ||
| shard_key_mapping | ||
| .values() | ||
| .flat_map(|v| v.iter()) | ||
| .copied() | ||
| .collect() | ||
| // Use wrapper type to support both formats | ||
| let shard_key_mapping: ShardKeyMappingWrapper = read_json(&mapping_path)?; | ||
| shard_key_mapping.shard_ids() |
There was a problem hiding this comment.
This is where we failed to recover the new shard format, which resulted in the CI errors here.
3037f49 to
7f1adf4
Compare
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
coszio
approved these changes
Mar 19, 2025
generall
approved these changes
Mar 19, 2025
This was referenced Mar 20, 2025
timvisee
added a commit
that referenced
this pull request
Mar 21, 2025
* Use new shard key storage wrapper type when recovering snapshot * Fix compiler warning
Merged
This was referenced Mar 21, 2025
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.
Fix snapshot restore with new shard key format introduced in #5838.
The new shard key storage format is now enabled by default in development builds through a feature flag.
All Submissions:
devbranch. Did you create your branch fromdev?New Feature Submissions:
cargo +nightly fmt --allcommand prior to submission?cargo clippy --all --all-featurescommand?