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

[test] Fix RetrySearchIntegTests #122919

Merged
merged 7 commits into from
Feb 24, 2025
Merged

[test] Fix RetrySearchIntegTests #122919

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a4a508c
[test] Fix `RetrySearchIntegTests`
arteam Feb 19, 2025
3c457b5
[CI] Auto commit changes from spotless
elasticsearchmachine Feb 19, 2025
33e1b50
Merge branch 'main' into fix-retry-search-integ-tests
arteam Feb 19, 2025
71ddc61
Merge branch 'main' into fix-retry-search-integ-tests
arteam Feb 20, 2025
487c0e9
Revert "[test] Fix `RetrySearchIntegTests`"
arteam Feb 20, 2025
ad8369b
Ensure the cluster is greeen after each node restart
arteam Feb 20, 2025
4aaf9ed
Unmute RetrySearchIntegTests#testSearcherId
arteam Feb 20, 2025
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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,6 @@ tests:
- class: org.elasticsearch.datastreams.DataStreamsClientYamlTestSuiteIT
method: test {p0=data_stream/120_data_streams_stats/Multiple data stream}
issue: https://github.com/elastic/elasticsearch/issues/118217
- class: org.elasticsearch.xpack.searchablesnapshots.RetrySearchIntegTests
method: testSearcherId
issue: https://github.com/elastic/elasticsearch/issues/118374
- class: org.elasticsearch.xpack.ccr.rest.ShardChangesRestIT
method: testShardChangesNoOperation
issue: https://github.com/elastic/elasticsearch/issues/118800
Expand Down
10 changes: 3 additions & 7 deletions ...alClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/RetrySearchIntegTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,8 @@ public void testSearcherId() throws Exception {
}
}

for (String allocatedNode : allocatedNodes) {
if (randomBoolean()) {
internalCluster().restartNode(allocatedNode);
}
if (randomBoolean()) {
internalCluster().restartNode(randomFrom(allocatedNodes));
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we retain the possibility for restarting all nodes by adding ensureGreen after each restart?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that was one options that I considered. I'm not sure whether it matters for the test if restart one or multiple nodes, since we just check that the search id and PIT are retained during node restarts, but I will update it to keep the original semantics of the test

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ad8369b

ensureGreen(indexName);
allocatedNodes = internalCluster().nodesInclude(indexName);
Expand Down Expand Up @@ -149,9 +147,7 @@ public void testRetryPointInTime() throws Exception {
assertHitCount(resp, docCount);
});
final Set<String> allocatedNodes = internalCluster().nodesInclude(indexName);
for (String allocatedNode : allocatedNodes) {
internalCluster().restartNode(allocatedNode);
}
internalCluster().restartNode(randomFrom(allocatedNodes));
ensureGreen(indexName);
assertNoFailuresAndResponse(
prepareSearch().setQuery(new RangeQueryBuilder("created_date").gte("2011-01-01").lte("2011-12-12"))
Expand Down