|
7 | 7 |
|
8 | 8 | import org.apache.lucene.index.DirectoryReader;
|
9 | 9 | import org.apache.lucene.index.FilterDirectoryReader;
|
| 10 | +import org.apache.lucene.index.NoMergePolicy; |
10 | 11 | import org.apache.lucene.search.MatchAllDocsQuery;
|
11 | 12 | import org.apache.lucene.search.ReferenceManager;
|
12 | 13 | import org.apache.lucene.search.TopDocs;
|
@@ -138,16 +139,17 @@ public void testCircuitBreakerAccounting() throws IOException {
|
138 | 139 | final AtomicLong globalCheckpoint = new AtomicLong(SequenceNumbers.NO_OPS_PERFORMED);
|
139 | 140 | try (Store store = createStore()) {
|
140 | 141 | CountingRefreshListener listener = new CountingRefreshListener();
|
141 |
| - EngineConfig config = config(defaultSettings, store, createTempDir(), newMergePolicy(), null, listener, null, |
142 |
| - globalCheckpoint::get, new HierarchyCircuitBreakerService(defaultSettings.getSettings(), |
| 142 | + EngineConfig config = config(defaultSettings, store, createTempDir(), |
| 143 | + NoMergePolicy.INSTANCE, // we don't merge we want no background merges to happen to ensure we have consistent breaker stats |
| 144 | + null, listener, null, globalCheckpoint::get, new HierarchyCircuitBreakerService(defaultSettings.getSettings(), |
143 | 145 | new ClusterSettings(defaultSettings.getNodeSettings(), ClusterSettings.BUILT_IN_CLUSTER_SETTINGS)));
|
144 | 146 | CircuitBreaker breaker = config.getCircuitBreakerService().getBreaker(CircuitBreaker.ACCOUNTING);
|
145 | 147 | long expectedUse;
|
146 | 148 | try (InternalEngine engine = createEngine(config)) {
|
147 | 149 | addDocuments(globalCheckpoint, engine);
|
148 |
| - engine.refresh("test"); // pull the reader |
| 150 | + engine.flush(false, true); // first flush to make sure we have a commit that we open in the frozen engine blow. |
| 151 | + engine.refresh("test"); // pull the reader to account for RAM in the breaker. |
149 | 152 | expectedUse = breaker.getUsed();
|
150 |
| - engine.flushAndClose(); |
151 | 153 | }
|
152 | 154 | assertTrue(expectedUse > 0);
|
153 | 155 | assertEquals(0, breaker.getUsed());
|
|
0 commit comments