honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-18 10:54:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix testAutoExpandIndicesDuringRollingUpgrade (#50427)

Browse Source 
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.

Closes #50426
This commit is contained in:
Yannick Welsch 2019-12-20 17:15:49 +01:00 committed by GitHub
parent 9646f3abad
commit c37c53a7f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java
View File

@ -775,7 +775,6 @@ public class RecoveryIT extends AbstractRollingTestCase {
} }
} }
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/50426")
public void testAutoExpandIndicesDuringRollingUpgrade() throws Exception { public void testAutoExpandIndicesDuringRollingUpgrade() throws Exception {
final String indexName = "test-auto-expand-filtering"; final String indexName = "test-auto-expand-filtering";
final Version minimumNodeVersion = minimumNodeVersion(); final Version minimumNodeVersion = minimumNodeVersion();
@ -796,12 +795,11 @@ public class RecoveryIT extends AbstractRollingTestCase {
Settings.builder().put(IndexMetaData.INDEX_ROUTING_EXCLUDE_GROUP_PREFIX + "._id", nodes.get(randomInt(2)))); Settings.builder().put(IndexMetaData.INDEX_ROUTING_EXCLUDE_GROUP_PREFIX + "._id", nodes.get(randomInt(2))));
} }
ensureGreen(indexName);
final int numberOfReplicas = Integer.parseInt( final int numberOfReplicas = Integer.parseInt(
getIndexSettingsAsMap(indexName).get(IndexMetaData.SETTING_NUMBER_OF_REPLICAS).toString()); getIndexSettingsAsMap(indexName).get(IndexMetaData.SETTING_NUMBER_OF_REPLICAS).toString());
if (minimumNodeVersion.onOrAfter(Version.V_7_6_0)) { if (minimumNodeVersion.onOrAfter(Version.V_7_6_0)) {
assertEquals(nodes.size() - 2, numberOfReplicas); assertEquals(nodes.size() - 2, numberOfReplicas);
ensureGreen(indexName);
} else { } else {
assertEquals(nodes.size() - 1, numberOfReplicas); assertEquals(nodes.size() - 1, numberOfReplicas);
} }