Fix testAutoExpandIndicesDuringRollingUpgrade #50427
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
ywelsch
added
>test
Collaborator
|
Pinging @elastic/es-distributed (:Distributed/Allocation) |
DaveCTurner
reviewed
Dec 20, 2019
| assertBusy(() -> { | ||
| final int numberOfReplicas = Integer.parseInt( | ||
| getIndexSettingsAsMap(indexName).get(IndexMetaData.SETTING_NUMBER_OF_REPLICAS).toString()); | ||
| if (minimumNodeVersion.onOrAfter(Version.V_7_6_0)) { |
Contributor
There was a problem hiding this comment.
Do we need the assertBusy() if minimumNodeVersion.onOrAfter(Version.V_7_6_0) or can we ensureGreen() in that case?
Contributor
Author
There was a problem hiding this comment.
Thanks for the question. We actually don't need assertBusy at all (#30423 was already introduced in 6.4, I misremembered this).
The ensureGreen is mostly for cosmetics. I've added it for the case where we are on 7.6.0+
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.
Fixes the muted test "testAutoExpandIndicesDuringRollingUpgrade". We can't wait in the test for the index to be green, as we have put a filter exclusion into place that prevents all shards from being allocated after a node rejoins. Instead we check whether the correct auto-expansion has taken place. We need to do this in an assertBusy, as older versions of ES are not auto-expanding indices while a node is joining, but only doing this as a follow-up step.
Closes #50426