Fix ShardGenerations in RepositoryData in BwC Case #48920
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
This assertion doesn't actually work, we don't have any guards against setting up the actual `ShardGenerations` object upstream in `SnapshotsService` that makes this work. The reason this didn't fail in BwC tests was that in most cases BwC runs continue to run with an old version master in the 2/3 upgraded case so a situation where the master and one data node are upgraded and put a generation into the generations object didn't come up.
original-brownbear
added
>test
|
Pinging @elastic/es-distributed (:Distributed/Snapshot/Restore) |
|
I would prefer to keep the assertion and adapt the call sites. I think this just needs adapting |
|
@ywelsch right, seems it's only that one spot in fact -> adjusted as suggested :) |
ywelsch
approved these changes
Nov 11, 2019
original-brownbear
changed the title
|
Thanks Yannick! |
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Nov 11, 2019
We were tripping the assertion that the makes sure we only have empty `ShardGenerations` in `RepositoryData` in the BwC case because shard generations were passed to the `Repository` in the BwC case. Fixed by only generating empty shard gen for BwC snapshots in `SnapshotsService`.
original-brownbear
added a commit
that referenced
this pull request
Nov 11, 2019
We were tripping the assertion that the makes sure we only have empty `ShardGenerations` in `RepositoryData` in the BwC case because shard generations were passed to the `Repository` in the BwC case. Fixed by only generating empty shard gen for BwC snapshots in `SnapshotsService`.
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.
We were tripping the assertion that the makes sure we only have empty
ShardGenerationsinRepositoryDatain the BwC case because shard generations were passed to theRepositoryin the BwC case. Fixed by only generating empty shard gen for BwC snapshots inSnapshotsService.Example failure: https://gradle-enterprise.elastic.co/s/p4gcla5uzwqxc/tests/by5gldejueyv2-jascz2copdfni