Skip to content

Commit f19fdcd

Browse files
authored
Re-enable accounting breaker check in InternalTestCluster (#38131)
Relates to #30290 The intent for this is to see whether this failure still happens, and if so, provide more up-to-date logs for analysis.
1 parent fb6a176 commit f19fdcd

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2424,10 +2424,9 @@ public void ensureEstimatedStats() {
24242424
final CircuitBreakerService breakerService = getInstanceFromNode(CircuitBreakerService.class, nodeAndClient.node);
24252425
CircuitBreaker fdBreaker = breakerService.getBreaker(CircuitBreaker.FIELDDATA);
24262426
assertThat("Fielddata breaker not reset to 0 on node: " + name, fdBreaker.getUsed(), equalTo(0L));
2427-
// TODO: This is commented out while Lee looks into the failures
2428-
// See: https://github.com/elastic/elasticsearch/issues/30290
2429-
// CircuitBreaker acctBreaker = breakerService.getBreaker(CircuitBreaker.ACCOUNTING);
2430-
// assertThat("Accounting breaker not reset to 0 on node: " + name, acctBreaker.getUsed(), equalTo(0L));
2427+
CircuitBreaker acctBreaker = breakerService.getBreaker(CircuitBreaker.ACCOUNTING);
2428+
assertThat("Accounting breaker not reset to 0 on node: " + name + ", are there still Lucene indices around?",
2429+
acctBreaker.getUsed(), equalTo(0L));
24312430
// Anything that uses transport or HTTP can increase the
24322431
// request breaker (because they use bigarrays), because of
24332432
// that the breaker can sometimes be incremented from ping

0 commit comments

Comments
 (0)