Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ref counts for MultiSearchResponse not released in tests #102604

Merged
merged 1 commit into from
Nov 24, 2023
Merged

Fix ref counts for MultiSearchResponse not released in tests #102604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions ...data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1846,10 +1846,14 @@ private static void verifyResolvability(
String expectedErrorMessage = "no such index [" + dataStream + "]";
if (requestBuilder instanceof MultiSearchRequestBuilder) {
MultiSearchResponse multiSearchResponse = ((MultiSearchRequestBuilder) requestBuilder).get();
assertThat(multiSearchResponse.getResponses().length, equalTo(1));
assertThat(multiSearchResponse.getResponses()[0].isFailure(), is(true));
assertThat(multiSearchResponse.getResponses()[0].getFailure(), instanceOf(IllegalArgumentException.class));
assertThat(multiSearchResponse.getResponses()[0].getFailure().getMessage(), equalTo(expectedErrorMessage));
try {
assertThat(multiSearchResponse.getResponses().length, equalTo(1));
assertThat(multiSearchResponse.getResponses()[0].isFailure(), is(true));
assertThat(multiSearchResponse.getResponses()[0].getFailure(), instanceOf(IllegalArgumentException.class));
assertThat(multiSearchResponse.getResponses()[0].getFailure().getMessage(), equalTo(expectedErrorMessage));
} finally {
multiSearchResponse.decRef();
}
} else if (requestBuilder instanceof ValidateQueryRequestBuilder) {
Exception e = expectThrows(IndexNotFoundException.class, requestBuilder::get);
assertThat(e.getMessage(), equalTo(expectedErrorMessage));
Expand All @@ -1862,7 +1866,11 @@ private static void verifyResolvability(
assertHitCount(searchRequestBuilder, expectedCount);
} else if (requestBuilder instanceof MultiSearchRequestBuilder) {
MultiSearchResponse multiSearchResponse = ((MultiSearchRequestBuilder) requestBuilder).get();
assertThat(multiSearchResponse.getResponses()[0].isFailure(), is(false));
try {
assertThat(multiSearchResponse.getResponses()[0].isFailure(), is(false));
} finally {
multiSearchResponse.decRef();
}
} else {
requestBuilder.get();
}
Expand Down
64 changes: 34 additions & 30 deletions ...or/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ public void testPercolatorQueryViaMultiSearch() throws Exception {
prepareIndex("test").setId("5").setSource(jsonBuilder().startObject().field("field1", "c").endObject()).get();
indicesAdmin().prepareRefresh().get();

MultiSearchResponse response = client().prepareMultiSearch()
final MultiSearchResponse response = client().prepareMultiSearch()
.add(
prepareSearch("test").setQuery(
new PercolateQueryBuilder(
Expand Down Expand Up @@ -1137,36 +1137,40 @@ public void testPercolatorQueryViaMultiSearch() throws Exception {
.setQuery(new PercolateQueryBuilder("query", "test", "6", null, null, null))
)
.get();
try {

MultiSearchResponse.Item item = response.getResponses()[0];
assertHitCount(item.getResponse(), 2L);
assertSearchHits(item.getResponse(), "1", "4");
assertThat(item.getFailureMessage(), nullValue());

item = response.getResponses()[1];
assertHitCount(item.getResponse(), 2L);
assertSearchHits(item.getResponse(), "2", "4");
assertThat(item.getFailureMessage(), nullValue());

item = response.getResponses()[2];
assertHitCount(item.getResponse(), 4L);
assertSearchHits(item.getResponse(), "1", "2", "3", "4");
assertThat(item.getFailureMessage(), nullValue());

item = response.getResponses()[3];
assertHitCount(item.getResponse(), 1L);
assertSearchHits(item.getResponse(), "4");
assertThat(item.getFailureMessage(), nullValue());

item = response.getResponses()[4];
assertHitCount(item.getResponse(), 2L);
assertSearchHits(item.getResponse(), "2", "4");
assertThat(item.getFailureMessage(), nullValue());

item = response.getResponses()[5];
assertThat(item.getResponse(), nullValue());
assertThat(item.getFailureMessage(), notNullValue());
assertThat(item.getFailureMessage(), containsString("[test/6] couldn't be found"));
MultiSearchResponse.Item item = response.getResponses()[0];
assertHitCount(item.getResponse(), 2L);
assertSearchHits(item.getResponse(), "1", "4");
assertThat(item.getFailureMessage(), nullValue());

item = response.getResponses()[1];
assertHitCount(item.getResponse(), 2L);
assertSearchHits(item.getResponse(), "2", "4");
assertThat(item.getFailureMessage(), nullValue());

item = response.getResponses()[2];
assertHitCount(item.getResponse(), 4L);
assertSearchHits(item.getResponse(), "1", "2", "3", "4");
assertThat(item.getFailureMessage(), nullValue());

item = response.getResponses()[3];
assertHitCount(item.getResponse(), 1L);
assertSearchHits(item.getResponse(), "4");
assertThat(item.getFailureMessage(), nullValue());

item = response.getResponses()[4];
assertHitCount(item.getResponse(), 2L);
assertSearchHits(item.getResponse(), "2", "4");
assertThat(item.getFailureMessage(), nullValue());

item = response.getResponses()[5];
assertThat(item.getResponse(), nullValue());
assertThat(item.getFailureMessage(), notNullValue());
assertThat(item.getFailureMessage(), containsString("[test/6] couldn't be found"));
} finally {
response.decRef();
}
}

public void testDisallowExpensiveQueries() throws IOException {
Expand Down
18 changes: 13 additions & 5 deletions ...r/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,9 +675,13 @@ private static void verify(ActionRequestBuilder<?, ?> requestBuilder, boolean fa
if (fail) {
if (requestBuilder instanceof MultiSearchRequestBuilder multiSearchRequestBuilder) {
MultiSearchResponse multiSearchResponse = multiSearchRequestBuilder.get();
assertThat(multiSearchResponse.getResponses().length, equalTo(1));
assertThat(multiSearchResponse.getResponses()[0].isFailure(), is(true));
assertThat(multiSearchResponse.getResponses()[0].getResponse(), nullValue());
try {
assertThat(multiSearchResponse.getResponses().length, equalTo(1));
assertThat(multiSearchResponse.getResponses()[0].isFailure(), is(true));
assertThat(multiSearchResponse.getResponses()[0].getResponse(), nullValue());
} finally {
multiSearchResponse.decRef();
}
} else {
try {
requestBuilder.get();
Expand All @@ -689,8 +693,12 @@ private static void verify(ActionRequestBuilder<?, ?> requestBuilder, boolean fa
assertHitCount(searchRequestBuilder, expectedCount);
} else if (requestBuilder instanceof MultiSearchRequestBuilder multiSearchRequestBuilder) {
MultiSearchResponse multiSearchResponse = multiSearchRequestBuilder.get();
assertThat(multiSearchResponse.getResponses().length, equalTo(1));
assertThat(multiSearchResponse.getResponses()[0].getResponse(), notNullValue());
try {
assertThat(multiSearchResponse.getResponses().length, equalTo(1));
assertThat(multiSearchResponse.getResponses()[0].getResponse(), notNullValue());
} finally {
multiSearchResponse.decRef();
}
} else {
requestBuilder.get();
}
Expand Down
35 changes: 21 additions & 14 deletions ...rc/internalClusterTest/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,14 +358,18 @@ public void testFailedMultiSearchWithWrongQuery() throws Exception {
.add(prepareSearch("test").setQuery(QueryBuilders.termQuery("nid", 2)))
.add(prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()))
.get();
assertThat(response.getResponses().length, equalTo(3));
assertThat(response.getResponses()[0].getFailureMessage(), notNullValue());
try {
assertThat(response.getResponses().length, equalTo(3));
assertThat(response.getResponses()[0].getFailureMessage(), notNullValue());

assertThat(response.getResponses()[1].getFailureMessage(), nullValue());
assertThat(response.getResponses()[1].getResponse().getHits().getHits().length, equalTo(1));
assertThat(response.getResponses()[1].getFailureMessage(), nullValue());
assertThat(response.getResponses()[1].getResponse().getHits().getHits().length, equalTo(1));

assertThat(response.getResponses()[2].getFailureMessage(), nullValue());
assertThat(response.getResponses()[2].getResponse().getHits().getHits().length, equalTo(10));
assertThat(response.getResponses()[2].getFailureMessage(), nullValue());
assertThat(response.getResponses()[2].getResponse().getHits().getHits().length, equalTo(10));
} finally {
response.decRef();
}

logger.info("Done Testing failed search");
}
Expand All @@ -375,7 +379,7 @@ public void testFailedMultiSearchWithWrongQueryWithFunctionScore() throws Except

logger.info("Start Testing failed multi search with a wrong query");

MultiSearchResponse response = client().prepareMultiSearch()
final MultiSearchResponse response = client().prepareMultiSearch()
// Add custom score query with bogus script
.add(
prepareSearch("test").setQuery(
Expand All @@ -388,15 +392,18 @@ public void testFailedMultiSearchWithWrongQueryWithFunctionScore() throws Except
.add(prepareSearch("test").setQuery(QueryBuilders.termQuery("nid", 2)))
.add(prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()))
.get();
assertThat(response.getResponses().length, equalTo(3));
assertThat(response.getResponses()[0].getFailureMessage(), notNullValue());

assertThat(response.getResponses()[1].getFailureMessage(), nullValue());
assertThat(response.getResponses()[1].getResponse().getHits().getHits().length, equalTo(1));
try {
assertThat(response.getResponses().length, equalTo(3));
assertThat(response.getResponses()[0].getFailureMessage(), notNullValue());

assertThat(response.getResponses()[2].getFailureMessage(), nullValue());
assertThat(response.getResponses()[2].getResponse().getHits().getHits().length, equalTo(10));
assertThat(response.getResponses()[1].getFailureMessage(), nullValue());
assertThat(response.getResponses()[1].getResponse().getHits().getHits().length, equalTo(1));

assertThat(response.getResponses()[2].getFailureMessage(), nullValue());
assertThat(response.getResponses()[2].getResponse().getHits().getHits().length, equalTo(10));
} finally {
response.decRef();
}
logger.info("Done Testing failed search");
}
}
52 changes: 31 additions & 21 deletions server/src/internalClusterTest/java/org/elasticsearch/search/msearch/MultiSearchIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,19 @@ public void testSimpleMultiSearch() {
.add(prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "yyy")))
.add(prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()))
.get();

for (MultiSearchResponse.Item item : response) {
assertNoFailures(item.getResponse());
try {
for (MultiSearchResponse.Item item : response) {
assertNoFailures(item.getResponse());
}
assertThat(response.getResponses().length, equalTo(3));
assertHitCount(response.getResponses()[0].getResponse(), 1L);
assertHitCount(response.getResponses()[1].getResponse(), 1L);
assertHitCount(response.getResponses()[2].getResponse(), 2L);
assertFirstHit(response.getResponses()[0].getResponse(), hasId("1"));
assertFirstHit(response.getResponses()[1].getResponse(), hasId("2"));
} finally {
response.decRef();
}
assertThat(response.getResponses().length, equalTo(3));
assertHitCount(response.getResponses()[0].getResponse(), 1L);
assertHitCount(response.getResponses()[1].getResponse(), 1L);
assertHitCount(response.getResponses()[2].getResponse(), 2L);
assertFirstHit(response.getResponses()[0].getResponse(), hasId("1"));
assertFirstHit(response.getResponses()[1].getResponse(), hasId("2"));
}

public void testSimpleMultiSearchMoreRequests() {
Expand All @@ -77,10 +80,14 @@ public void testSimpleMultiSearchMoreRequests() {
}

MultiSearchResponse response = client().multiSearch(request).actionGet();
assertThat(response.getResponses().length, equalTo(numSearchRequests));
for (MultiSearchResponse.Item item : response) {
assertNoFailures(item.getResponse());
assertHitCount(item.getResponse(), numDocs);
try {
assertThat(response.getResponses().length, equalTo(numSearchRequests));
for (MultiSearchResponse.Item item : response) {
assertNoFailures(item.getResponse());
assertHitCount(item.getResponse(), numDocs);
}
} finally {
response.decRef();
}
}

Expand All @@ -105,13 +112,16 @@ public TransportVersion getMinimalSupportedVersion() {
}
}))
.get();

assertThat(response.getResponses().length, equalTo(3));
assertHitCount(response.getResponses()[0].getResponse(), 1L);
assertHitCount(response.getResponses()[1].getResponse(), 1L);
assertTrue(response.getResponses()[2].isFailure());
assertTrue(
response.getResponses()[2].getFailure().getMessage().contains("the 'search.check_ccs_compatibility' setting is enabled")
);
try {
assertThat(response.getResponses().length, equalTo(3));
assertHitCount(response.getResponses()[0].getResponse(), 1L);
assertHitCount(response.getResponses()[1].getResponse(), 1L);
assertTrue(response.getResponses()[2].isFailure());
assertTrue(
response.getResponses()[2].getFailure().getMessage().contains("the 'search.check_ccs_compatibility' setting is enabled")
);
} finally {
response.decRef();
}
}
}
78 changes: 43 additions & 35 deletions .../src/internalClusterTest/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,47 +123,55 @@ public void testProfileMatchesRegular() throws Exception {
.setSearchType(SearchType.QUERY_THEN_FETCH)
.setRequestCache(false);

MultiSearchResponse.Item[] responses = client().prepareMultiSearch().add(vanilla).add(profile).get().getResponses();

SearchResponse vanillaResponse = responses[0].getResponse();
SearchResponse profileResponse = responses[1].getResponse();

assertThat(vanillaResponse.getFailedShards(), equalTo(0));
assertThat(profileResponse.getFailedShards(), equalTo(0));
assertThat(vanillaResponse.getSuccessfulShards(), equalTo(profileResponse.getSuccessfulShards()));

float vanillaMaxScore = vanillaResponse.getHits().getMaxScore();
float profileMaxScore = profileResponse.getHits().getMaxScore();
if (Float.isNaN(vanillaMaxScore)) {
assertTrue("Vanilla maxScore is NaN but Profile is not [" + profileMaxScore + "]", Float.isNaN(profileMaxScore));
} else {
assertEquals(
"Profile maxScore of [" + profileMaxScore + "] is not close to Vanilla maxScore [" + vanillaMaxScore + "]",
vanillaMaxScore,
profileMaxScore,
0.001
);
}
MultiSearchResponse response = client().prepareMultiSearch().add(vanilla).add(profile).get();
try {
MultiSearchResponse.Item[] responses = response.getResponses();

SearchResponse vanillaResponse = responses[0].getResponse();
SearchResponse profileResponse = responses[1].getResponse();

if (vanillaResponse.getHits().getTotalHits().value != profileResponse.getHits().getTotalHits().value) {
Set<SearchHit> vanillaSet = new HashSet<>(Arrays.asList(vanillaResponse.getHits().getHits()));
Set<SearchHit> profileSet = new HashSet<>(Arrays.asList(profileResponse.getHits().getHits()));
if (vanillaResponse.getHits().getTotalHits().value > profileResponse.getHits().getTotalHits().value) {
vanillaSet.removeAll(profileSet);
fail("Vanilla hits were larger than profile hits. Non-overlapping elements were: " + vanillaSet.toString());
assertThat(vanillaResponse.getFailedShards(), equalTo(0));
assertThat(profileResponse.getFailedShards(), equalTo(0));
assertThat(vanillaResponse.getSuccessfulShards(), equalTo(profileResponse.getSuccessfulShards()));

float vanillaMaxScore = vanillaResponse.getHits().getMaxScore();
float profileMaxScore = profileResponse.getHits().getMaxScore();
if (Float.isNaN(vanillaMaxScore)) {
assertTrue("Vanilla maxScore is NaN but Profile is not [" + profileMaxScore + "]", Float.isNaN(profileMaxScore));
} else {
profileSet.removeAll(vanillaSet);
fail("Profile hits were larger than vanilla hits. Non-overlapping elements were: " + profileSet.toString());
assertEquals(
"Profile maxScore of [" + profileMaxScore + "] is not close to Vanilla maxScore [" + vanillaMaxScore + "]",
vanillaMaxScore,
profileMaxScore,
0.001
);
}
}

SearchHit[] vanillaHits = vanillaResponse.getHits().getHits();
SearchHit[] profileHits = profileResponse.getHits().getHits();
if (vanillaResponse.getHits().getTotalHits().value != profileResponse.getHits().getTotalHits().value) {
Set<SearchHit> vanillaSet = new HashSet<>(Arrays.asList(vanillaResponse.getHits().getHits()));
Set<SearchHit> profileSet = new HashSet<>(Arrays.asList(profileResponse.getHits().getHits()));
if (vanillaResponse.getHits().getTotalHits().value > profileResponse.getHits().getTotalHits().value) {
vanillaSet.removeAll(profileSet);
fail("Vanilla hits were larger than profile hits. Non-overlapping elements were: " + vanillaSet.toString());
} else {
profileSet.removeAll(vanillaSet);
fail("Profile hits were larger than vanilla hits. Non-overlapping elements were: " + profileSet.toString());
}
}

for (int j = 0; j < vanillaHits.length; j++) {
assertThat("Profile hit #" + j + " has a different ID from Vanilla", vanillaHits[j].getId(), equalTo(profileHits[j].getId()));
}
SearchHit[] vanillaHits = vanillaResponse.getHits().getHits();
SearchHit[] profileHits = profileResponse.getHits().getHits();

for (int j = 0; j < vanillaHits.length; j++) {
assertThat(
"Profile hit #" + j + " has a different ID from Vanilla",
vanillaHits[j].getId(),
equalTo(profileHits[j].getId())
);
}
} finally {
response.decRef();
}
}

/**
Expand Down
Loading