From 69768afb66f4840dd251991730bb25f5f0710950 Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Fri, 20 Dec 2019 12:32:23 +0100 Subject: [PATCH 1/2] Fix testAutoExpandIndicesDuringRollingUpgrade --- .../elasticsearch/upgrades/RecoveryIT.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java index bf842bdd6e021..a896a164db7e9 100644 --- a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java +++ b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java @@ -775,7 +775,6 @@ public void testTurnOffTranslogRetentionAfterUpgraded() throws Exception { } } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/50426") public void testAutoExpandIndicesDuringRollingUpgrade() throws Exception { final String indexName = "test-auto-expand-filtering"; final Version minimumNodeVersion = minimumNodeVersion(); @@ -796,15 +795,15 @@ public void testAutoExpandIndicesDuringRollingUpgrade() throws Exception { Settings.builder().put(IndexMetaData.INDEX_ROUTING_EXCLUDE_GROUP_PREFIX + "._id", nodes.get(randomInt(2)))); } - ensureGreen(indexName); - - final int numberOfReplicas = Integer.parseInt( - getIndexSettingsAsMap(indexName).get(IndexMetaData.SETTING_NUMBER_OF_REPLICAS).toString()); - if (minimumNodeVersion.onOrAfter(Version.V_7_6_0)) { - assertEquals(nodes.size() - 2, numberOfReplicas); - } else { - assertEquals(nodes.size() - 1, numberOfReplicas); - } + assertBusy(() -> { + final int numberOfReplicas = Integer.parseInt( + getIndexSettingsAsMap(indexName).get(IndexMetaData.SETTING_NUMBER_OF_REPLICAS).toString()); + if (minimumNodeVersion.onOrAfter(Version.V_7_6_0)) { + assertEquals(nodes.size() - 2, numberOfReplicas); + } else { + assertEquals(nodes.size() - 1, numberOfReplicas); + } + }); } @SuppressWarnings("unchecked") From 04166ddee1a4d3a3eac27c4dab5691cf512b222d Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Fri, 20 Dec 2019 15:58:02 +0100 Subject: [PATCH 2/2] revise conditions --- .../org/elasticsearch/upgrades/RecoveryIT.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java index a896a164db7e9..00b412610705d 100644 --- a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java +++ b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java @@ -795,15 +795,14 @@ public void testAutoExpandIndicesDuringRollingUpgrade() throws Exception { Settings.builder().put(IndexMetaData.INDEX_ROUTING_EXCLUDE_GROUP_PREFIX + "._id", nodes.get(randomInt(2)))); } - assertBusy(() -> { - final int numberOfReplicas = Integer.parseInt( - getIndexSettingsAsMap(indexName).get(IndexMetaData.SETTING_NUMBER_OF_REPLICAS).toString()); - if (minimumNodeVersion.onOrAfter(Version.V_7_6_0)) { - assertEquals(nodes.size() - 2, numberOfReplicas); - } else { - assertEquals(nodes.size() - 1, numberOfReplicas); - } - }); + final int numberOfReplicas = Integer.parseInt( + getIndexSettingsAsMap(indexName).get(IndexMetaData.SETTING_NUMBER_OF_REPLICAS).toString()); + if (minimumNodeVersion.onOrAfter(Version.V_7_6_0)) { + assertEquals(nodes.size() - 2, numberOfReplicas); + ensureGreen(indexName); + } else { + assertEquals(nodes.size() - 1, numberOfReplicas); + } } @SuppressWarnings("unchecked")