diff --git a/muted-tests.yml b/muted-tests.yml index b45b9f7840d85..8fa688d8609f4 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -438,9 +438,6 @@ tests: - class: org.elasticsearch.xpack.inference.action.filter.ShardBulkInferenceActionFilterIT method: testRestart {p0=true p1=true} issue: https://github.com/elastic/elasticsearch/issues/127595 -- class: org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT - method: testRestoreSnapshotAllocationDoesNotExceedWatermarkWithMultipleRestores - issue: https://github.com/elastic/elasticsearch/issues/127286 - class: org.elasticsearch.xpack.test.rest.XPackRestIT method: test {p0=ml/data_frame_analytics_cat_apis/Test cat data frame analytics all jobs with header} issue: https://github.com/elastic/elasticsearch/issues/127625 diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java index dc0281f40bb6c..6f2be0a188b9e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java @@ -56,7 +56,6 @@ import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.in; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.lessThanOrEqualTo; @@ -242,7 +241,7 @@ public void testRestoreSnapshotAllocationDoesNotExceedWatermarkWithMultipleResto clusterAdmin().prepareRestoreSnapshot(TEST_REQUEST_TIMEOUT, "repo", "snap") .setWaitForCompletion(true) .setRenamePattern(indexName) - .setRenameReplacement(indexName + "-copy") + .setRenameReplacement(copyIndexName) .execute(ActionTestUtils.assertNoFailureListener(restoreSnapshotResponse -> { final RestoreInfo restoreInfo = restoreSnapshotResponse.getRestoreInfo(); assertThat(restoreInfo.successfulShards(), is(snapshotInfo.totalShards())); @@ -268,10 +267,19 @@ public void testRestoreSnapshotAllocationDoesNotExceedWatermarkWithMultipleResto // wait for all the shards to finish moving safeAwait(allShardsActiveListener); - ensureGreen(indexName, indexName + "-copy"); + ensureGreen(indexName, copyIndexName); final var tinyNodeShardIds = getShardIds(dataNodeId, indexName); - assertThat(tinyNodeShardIds, hasSize(1)); + final var tinyNodeShardIdsCopy = getShardIds(dataNodeId, copyIndexName); + assertThat( + "expected just one shard from one index on the tiny node, instead got " + + tinyNodeShardIds + + " from the original index and " + + tinyNodeShardIdsCopy + + " from the copy", + tinyNodeShardIds.size() + tinyNodeShardIdsCopy.size(), + is(1) + ); assertThat(tinyNodeShardIds.iterator().next(), in(shardSizes.getShardIdsWithSizeSmallerOrEqual(usableSpace))); }