Skip to content

Commit fbc4bb7

Browse files
committed
Release things before asserting in finally block
1 parent 1062778 commit fbc4bb7

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

server/src/test/java/org/elasticsearch/search/SearchServiceSingleNodeTests.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2986,19 +2986,21 @@ public void testFetchPhaseAccountsForSourceMemoryUsage() throws Exception {
29862986
fetchSearchResult = listener.get();
29872987
long usedAfterFetch = breaker.getUsed();
29882988
assertThat(usedAfterFetch, greaterThan(usedBeforeFetch));
2989-
logger.debug("--> usedBeforeFetch: [{}], usedAfterFetch: [{}]", usedBeforeFetch, usedAfterFetch);
2989+
logger.info("--> usedBeforeFetch: [{}], usedAfterFetch: [{}]", usedBeforeFetch, usedAfterFetch);
29902990
// 48 docs with at least 1000 bytes in the source
29912991
assertThat((usedAfterFetch - usedBeforeFetch), greaterThanOrEqualTo(48_000L));
29922992
} finally {
2993+
if (readerContext != null) {
2994+
service.freeReaderContext(readerContext.id());
2995+
}
29932996
if (fetchSearchResult != null) {
2994-
long usedBeforeDecref = breaker.getUsed();
2995-
assertThat(usedBeforeDecref, greaterThanOrEqualTo(48_000L));
2997+
long usedBeforeResultDecRef = breaker.getUsed();
29962998
fetchSearchResult.decRef();
2999+
assertThat(usedBeforeResultDecRef, greaterThanOrEqualTo(48_000L));
29973000
// when releasing the result references we should clear at least 48_000 bytes (48 hits with sources of at least 1000 bytes)
2998-
assertThat(usedBeforeDecref - breaker.getUsed(), greaterThanOrEqualTo(48_000L));
2999-
}
3000-
if (readerContext != null) {
3001-
service.freeReaderContext(readerContext.id());
3001+
long usedAfterResultDecRef = breaker.getUsed();
3002+
logger.info("--> usedBeforeResultDecRef: [{}], usedAfterResultDecRef: [{}]", usedBeforeResultDecRef, usedAfterResultDecRef);
3003+
assertThat(usedBeforeResultDecRef - usedAfterResultDecRef, greaterThanOrEqualTo(48_000L));
30023004
}
30033005
}
30043006
}

0 commit comments

Comments
 (0)