diff --git a/muted-tests.yml b/muted-tests.yml index 59e60d74daccc..d8809d773399e 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -268,9 +268,6 @@ tests: - class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT method: test {p0=nodes.stats/11_indices_metrics/indices mappings exact count test for indices level} issue: https://github.com/elastic/elasticsearch/issues/120950 -- class: org.elasticsearch.xpack.shutdown.AllocationFailuresResetOnShutdownIT - method: testResetAllocationFailuresOnNodeShutdown - issue: https://github.com/elastic/elasticsearch/issues/121129 - class: org.elasticsearch.xpack.security.authc.jwt.JwtRealmSingleNodeTests method: testActivateProfileForJWT issue: https://github.com/elastic/elasticsearch/issues/120983 diff --git a/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/AllocationFailuresResetOnShutdownIT.java b/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/AllocationFailuresResetOnShutdownIT.java index b6c6843d766f9..320a0025b1026 100644 --- a/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/AllocationFailuresResetOnShutdownIT.java +++ b/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/AllocationFailuresResetOnShutdownIT.java @@ -175,10 +175,10 @@ public void beforeIndexShardCreated(ShardRouting routing, Settings indexSettings prepareCreate("index1", indexSettings(1, 0)).execute(); - // await all relocation attempts are exhausted + // await all allocation attempts are exhausted var maxAttempts = MaxRetryAllocationDecider.SETTING_ALLOCATION_MAX_RETRY.get(Settings.EMPTY); ensureRed("index1"); - { + assertBusy(() -> { var state = safeGet(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).execute()).getState(); var index = state.getRoutingTable().index("index1"); assertNotNull(index); @@ -186,7 +186,7 @@ public void beforeIndexShardCreated(ShardRouting routing, Settings indexSettings assertNotNull(shard); assertNotNull(shard.unassignedInfo()); assertThat(maxAttempts, equalTo(shard.unassignedInfo().failedAllocations())); - } + }); failAllocation.set(false); @@ -240,13 +240,13 @@ public void beforeIndexShardCreated(ShardRouting routing, Settings indexSettings // await all allocation attempts are exhausted var maxAttempts = MaxRetryAllocationDecider.SETTING_ALLOCATION_MAX_RETRY.get(Settings.EMPTY); ensureRed("index1"); - { + assertBusy(() -> { var state = safeGet(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).execute()).getState(); var shard = state.getRoutingTable().index("index1").shard(0).primaryShard(); assertNotNull(shard); assertNotNull(shard.unassignedInfo()); assertThat(maxAttempts, equalTo(shard.unassignedInfo().failedAllocations())); - } + }); failAllocation.set(false);