diff --git a/muted-tests.yml b/muted-tests.yml index 502b9a3ab0634..b57976e2ae3de 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -259,9 +259,6 @@ tests: - class: org.elasticsearch.smoketest.SmokeTestMonitoringWithSecurityIT method: testHTTPExporterWithSSL issue: https://github.com/elastic/elasticsearch/issues/122220 -- class: org.elasticsearch.blocks.SimpleBlocksIT - method: testConcurrentAddBlock - issue: https://github.com/elastic/elasticsearch/issues/122324 - class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT method: test {yaml=reference/cat/health/cat-health-example} issue: https://github.com/elastic/elasticsearch/issues/122335 diff --git a/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java index 93f8997ff24a1..b11861833a2ba 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java @@ -405,11 +405,13 @@ public void testConcurrentAddBlock() throws InterruptedException, ExecutionExcep try { startInParallel(threadCount, i -> { try { - indicesAdmin().prepareAddBlock(block, indexName).get(); + assertBusy(() -> assertAcked(indicesAdmin().prepareAddBlock(block, indexName).get())); assertIndexHasBlock(block, indexName); } catch (final ClusterBlockException e) { assertThat(e.blocks(), hasSize(1)); assertTrue(e.blocks().stream().allMatch(b -> b.id() == block.getBlock().id())); + } catch (Exception e) { + throw new RuntimeException("Unable to ack an index block request", e); } }); assertIndexHasBlock(block, indexName);