honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reenable accounting circuit breaker (#44495) 

We have a new Lucene 8.2 snapshot on master and 7.x; hence we can
re-enable the accounting on these branches.

Relates #30290
This commit is contained in:
Nhat Nguyen 2019-07-17 13:45:16 -04:00
parent 34c6067018
commit 458f24c46a
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
View File

@ -5708,7 +5708,6 @@ public class InternalEngineTests extends EngineTestCase {
assertMaxSeqNoInCommitUserData(engine); assertMaxSeqNoInCommitUserData(engine);
} }
@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/LUCENE-8809")
public void testRefreshAndFailEngineConcurrently() throws Exception { public void testRefreshAndFailEngineConcurrently() throws Exception {
AtomicBoolean stopped = new AtomicBoolean(); AtomicBoolean stopped = new AtomicBoolean();
Semaphore indexedDocs = new Semaphore(0); Semaphore indexedDocs = new Semaphore(0);

19
test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
View File

@ -2426,16 +2426,15 @@ public final class InternalTestCluster extends TestCluster {
CircuitBreaker fdBreaker = breakerService.getBreaker(CircuitBreaker.FIELDDATA); CircuitBreaker fdBreaker = breakerService.getBreaker(CircuitBreaker.FIELDDATA);
assertThat("Fielddata breaker not reset to 0 on node: " + name, fdBreaker.getUsed(), equalTo(0L)); 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 {
// try { assertBusy(() -> {
// assertBusy(() -> { CircuitBreaker acctBreaker = breakerService.getBreaker(CircuitBreaker.ACCOUNTING);
// CircuitBreaker acctBreaker = breakerService.getBreaker(CircuitBreaker.ACCOUNTING); assertThat("Accounting breaker not reset to 0 on node: " + name + ", are there still Lucene indices around?",
// assertThat("Accounting breaker not reset to 0 on node: " + name + ", are there still Lucene indices around?", acctBreaker.getUsed(), equalTo(0L));
// acctBreaker.getUsed(), equalTo(0L)); });
// }); } catch (Exception e) {
// } catch (Exception e) { throw new AssertionError("Exception during check for accounting breaker reset to 0", e);
// throw new AssertionError("Exception during check for accounting breaker reset to 0", e); }
// }
// Anything that uses transport or HTTP can increase the // Anything that uses transport or HTTP can increase the
// request breaker (because they use bigarrays), because of // request breaker (because they use bigarrays), because of