diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index 922f89f8ae1..0df178f924e 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -5708,7 +5708,6 @@ public class InternalEngineTests extends EngineTestCase { assertMaxSeqNoInCommitUserData(engine); } - @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/LUCENE-8809") public void testRefreshAndFailEngineConcurrently() throws Exception { AtomicBoolean stopped = new AtomicBoolean(); Semaphore indexedDocs = new Semaphore(0); diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java index bd3340dd6b0..26908aeb2fc 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java +++ b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java @@ -2426,16 +2426,15 @@ public final class InternalTestCluster extends TestCluster { CircuitBreaker fdBreaker = breakerService.getBreaker(CircuitBreaker.FIELDDATA); assertThat("Fielddata breaker not reset to 0 on node: " + name, fdBreaker.getUsed(), equalTo(0L)); - // Mute this assertion until we have a new Lucene snapshot with https://issues.apache.org/jira/browse/LUCENE-8809. - // try { - // assertBusy(() -> { - // CircuitBreaker acctBreaker = breakerService.getBreaker(CircuitBreaker.ACCOUNTING); - // assertThat("Accounting breaker not reset to 0 on node: " + name + ", are there still Lucene indices around?", - // acctBreaker.getUsed(), equalTo(0L)); - // }); - // } catch (Exception e) { - // throw new AssertionError("Exception during check for accounting breaker reset to 0", e); - // } + try { + assertBusy(() -> { + CircuitBreaker acctBreaker = breakerService.getBreaker(CircuitBreaker.ACCOUNTING); + assertThat("Accounting breaker not reset to 0 on node: " + name + ", are there still Lucene indices around?", + acctBreaker.getUsed(), equalTo(0L)); + }); + } catch (Exception e) { + throw new AssertionError("Exception during check for accounting breaker reset to 0", e); + } // Anything that uses transport or HTTP can increase the // request breaker (because they use bigarrays), because of