Fixing upgrade test when the original cluster is the current version

masseyke · Dec 17, 2024 · fa3db8e · fa3db8e
1 parent bc4c3d8
commit fa3db8e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DataStreamsUpgradeIT.java b/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DataStreamsUpgradeIT.java
@@ -290,7 +290,12 @@ private void performUpgradedClusterOperations(String dataStreamName, int numRoll
             );
             assertOK(statusResponse);
             assertThat(statusResponseMap.get("complete"), equalTo(true));
-            assertThat(statusResponseMap.get("successes"), equalTo(numRollovers + 1));
+            if (isOriginalClusterCurrent()) {
+                // If the original cluster was the same as this one, we don't want any indices reindexed:
+                assertThat(statusResponseMap.get("successes"), equalTo(0));
+            } else {
+                assertThat(statusResponseMap.get("successes"), equalTo(numRollovers + 1));
+            }
         }, 60, TimeUnit.SECONDS);
         Request cancelRequest = new Request("POST", "_migration/reindex/" + dataStreamName + "/_cancel");
         Response cancelResponse = client().performRequest(cancelRequest);