Skip to content

SQL: stabilize SqlSearchPageTimeoutIT #79928

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

Merged
elasticsearchmachine merged 5 commits into from
Oct 28, 2021
Merged

SQL: stabilize SqlSearchPageTimeoutIT #79928

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4460c0
SQL: stabilize SqlSearchPageTimeoutIT
Oct 27, 2021
87c50b3
make it even more stable
Oct 27, 2021
a9c1f26
Merge origin/main into fix/stabilizePageTimeoutTests
Oct 27, 2021
6e08084
Merge origin/main into fix/stabilizePageTimeoutTests
Oct 28, 2021
1c90729
unmute test
Oct 28, 2021
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
11 changes: 4 additions & 7 deletions ...c/internalClusterTest/java/org/elasticsearch/xpack/sql/action/SqlSearchPageTimeoutIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.elasticsearch.search.SearchService;

import java.util.Arrays;
import java.util.concurrent.TimeUnit;

import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.hamcrest.Matchers.contains;
Expand All @@ -28,24 +27,22 @@ public class SqlSearchPageTimeoutIT extends AbstractSqlIntegTestCase {
protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
Settings.Builder settings = Settings.builder().put(super.nodeSettings(nodeOrdinal, otherSettings));
// use static low keepAlive interval to ensure obsolete search contexts are pruned soon enough
settings.put(SearchService.KEEPALIVE_INTERVAL_SETTING.getKey(), TimeValue.timeValueMillis(200));
settings.put(SearchService.KEEPALIVE_INTERVAL_SETTING.getKey(), TimeValue.timeValueMillis(100));
return settings.build();
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/79928")
public void testSearchContextIsCleanedUpAfterPageTimeoutForHitsQueries() throws Exception {
setupTestIndex();

SqlQueryResponse response = new SqlQueryRequestBuilder(client(), SqlQueryAction.INSTANCE).query("SELECT field FROM test")
.fetchSize(1)
.pageTimeout(TimeValue.timeValueMillis(100))
.pageTimeout(TimeValue.timeValueMillis(500))
.get();

assertEquals(1, response.size());
assertTrue(response.hasCursor());
assertEquals(1, getNumberOfSearchContexts());

assertBusy(() -> assertEquals(0, getNumberOfSearchContexts()), 3, TimeUnit.SECONDS);
assertBusy(() -> assertEquals(0, getNumberOfSearchContexts()));

SearchPhaseExecutionException exception = expectThrows(
SearchPhaseExecutionException.class,
Expand All @@ -60,7 +57,7 @@ public void testNoSearchContextForAggregationQueries() throws InterruptedExcepti

SqlQueryResponse response = new SqlQueryRequestBuilder(client(), SqlQueryAction.INSTANCE).query(
"SELECT COUNT(*) FROM test GROUP BY field"
).fetchSize(1).pageTimeout(TimeValue.timeValueMillis(100)).get();
).fetchSize(1).pageTimeout(TimeValue.timeValueMillis(500)).get();

assertEquals(1, response.size());
assertTrue(response.hasCursor());
Expand Down