From fef75acbef0bfb2c9aef6a65fd65d38d5e60c336 Mon Sep 17 00:00:00 2001 From: Parker Timmins Date: Fri, 21 Feb 2025 21:35:30 -0600 Subject: [PATCH] Fix broken test caused by setting old write index to read-only verified (#123190) (#123209) #122887 set read-only on the source indices of a data stream reindex. To test behavior when the source index was already read-only, testDataStreamUpgrade sometimes set the old write index to read-only. But the rest end point for adding a read-only block always sets verifed-read-only. This caused the old write index to not need to be upgraded, resulting in an incorrect value for total_indices_requiring_upgrade (cherry picked from commit 8b25a7281d395176102b379b03a4a67d802ae5d4) # Conflicts: # muted-tests.yml --- .../java/org/elasticsearch/upgrades/DataStreamsUpgradeIT.java | 3 --- 1 file changed, 3 deletions(-) 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 index 9016f594b5b47..8a05eff36481e 100644 --- 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 @@ -566,9 +566,6 @@ private void upgradeDataStream(String dataStreamName, int numRolloversOnOldClust if (randomBoolean()) { closeIndex(oldIndexName); } - if (randomBoolean()) { - assertOK(client().performRequest(new Request("PUT", oldIndexName + "/_block/read_only"))); - } } Request reindexRequest = new Request("POST", "/_migration/reindex"); reindexRequest.setJsonEntity(Strings.format("""