Don't recover from buggy version #9925
Merged
Conversation
This file contains 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
|
+1 this looks great. |
|
+1 |
| return; | ||
| final Version sourceNodeVersion = recoveryStatus.sourceNode().version(); | ||
| if (sourceNodeVersion.before(Version.V_1_3_2) && recoverySettings.compress()) { // don't recover from pre 1.3.2 if compression is on? | ||
| throw new ElasticsearchIllegalStateException("Can't recovery from node " |
There was a problem hiding this comment.
Can't recovery -> Can't recover
|
+1, just left a couple minor comments. |
|
@mikemccand @rmuir @rjernst pushed a new commit with unittests... |
| recoveryTarget.existingFiles(discoNode, store, withCompression); | ||
| assertTrue(discoNode.version() + " " + withCompression, version.onOrAfter(Version.V_1_3_2) || withCompression == false); | ||
| } catch (ElasticsearchIllegalStateException ex) { | ||
| // all is good |
There was a problem hiding this comment.
can we check that we expect this exception? i.e., when version is before 1.3.2 and compression is on?
|
+1 on the change. I think the 1.3.2 part is better implemented as an allocation decider to prevent the master repeatedly trying to allocate it and failing. I checked and it's fairly easy to integrate this into |
|
@bleskes here is a new commit |
| // clusterState = stabilize(clusterState, service); | ||
| // routingTable = clusterState.routingTable(); | ||
| // for (int i = 0; i < routingTable.index("test").shards().size(); i++) { | ||
| // assertThat(routingTable.index("test").shard(i).shards().size(), equalTo(3)); |
|
LGTM. Thx @s1monw |
This commit forces a full recovery if the source node is < 1.4.0 and prevents any recoveries from pre 1.3.2 nodes if compression is enabled to work around elastic#7210 Closes elastic#9922
|
Closes #9922 |
clintongormley
added
>bug
v2.0.0-beta1
release highlight
v1.5.0
:Distributed/Recovery
clintongormley
changed the title
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.
This commit forces a full recovery if the source node is < 1.4.0 and
prevents any recoveries from pre 1.3.2 nodes to
work around #7210
Closes #9922
note: this is just a start, I need to fix some BWC test first before this can be pulled in but I wanted to get the discussion going