Skip to content

[Backport 3.0] [Flaky Test] Fix Flaky SearchServiceTests.testConcurrentSegmentSearchWithRandomizedModeSettings #18308

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
merged 1 commit into from
May 15, 2025
Merged

[Backport 3.0] [Flaky Test] Fix Flaky SearchServiceTests.testConcurrentSegmentSearchWithRandomizedModeSettings #18308

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
113 changes: 66 additions & 47 deletions server/src/test/java/org/opensearch/search/SearchServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1498,17 +1498,6 @@ public void testConcurrentSegmentSearchWithRandomizedModeSettings() throws IOExc
String clusterMode = randomFrom(modeSettings);
String indexMode = randomFrom(modeSettings);

// default to false in case mode setting is not set
boolean concurrentSearchEnabled = false;

boolean aggregationSupportsConcurrent = randomBoolean();

if (indexMode != null) {
concurrentSearchEnabled = !indexMode.equals("none") && aggregationSupportsConcurrent;
} else if (clusterMode != null) {
concurrentSearchEnabled = !clusterMode.equals("none") && aggregationSupportsConcurrent;
}

// Set the cluster setting for mode
if (clusterMode == null) {
client().admin()
Expand Down Expand Up @@ -1539,46 +1528,76 @@ public void testConcurrentSegmentSearchWithRandomizedModeSettings() throws IOExc
.get();
}

try (DefaultSearchContext searchContext = service.createSearchContext(request, new TimeValue(System.currentTimeMillis()))) {
assertEquals(
clusterMode,
client().admin()
.cluster()
.prepareState()
.get()
.getState()
.getMetadata()
.transientSettings()
.get(SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_MODE.getKey())
);
assertEquals(
indexMode,
client().admin()
.indices()
.prepareGetSettings(index)
.get()
.getSetting(index, IndexSettings.INDEX_CONCURRENT_SEGMENT_SEARCH_MODE.getKey())
);
SearchContextAggregations mockAggregations = mock(SearchContextAggregations.class);
when(mockAggregations.factories()).thenReturn(mock(AggregatorFactories.class));
when(mockAggregations.factories().allFactoriesSupportConcurrentSearch()).thenReturn(aggregationSupportsConcurrent);

// set the aggregations for context
searchContext.aggregations(mockAggregations);

searchContext.evaluateRequestShouldUseConcurrentSearch();
// check concurrentSearchenabled based on mode and supportedAggregation is computed correctly
assertEquals(concurrentSearchEnabled, searchContext.shouldUseConcurrentSearch());
assertThat(searchContext.searcher().getTaskExecutor(), is(notNullValue()));
} finally {
// Cleanup
assertEquals(
clusterMode,
client().admin()
.cluster()
.prepareUpdateSettings()
.setTransientSettings(Settings.builder().putNull(SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_MODE.getKey()))
.get();
.prepareState()
.get()
.getState()
.getMetadata()
.transientSettings()
.get(SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_MODE.getKey())
);
assertEquals(
indexMode,
client().admin()
.indices()
.prepareGetSettings(index)
.get()
.getSetting(index, IndexSettings.INDEX_CONCURRENT_SEGMENT_SEARCH_MODE.getKey())
);

boolean concurrentSearchEnabled;
// with aggregations.
{
boolean aggregationSupportsConcurrent = randomBoolean();
// Default concurrent search mode is auto, which enables concurrent segment search when aggregations are present.
// aggregationSupportsConcurrent determines if the present aggregation type supports concurrent segment search.
concurrentSearchEnabled = aggregationSupportsConcurrent;
if (indexMode != null) {
concurrentSearchEnabled = !indexMode.equals("none") && aggregationSupportsConcurrent;
} else if (clusterMode != null) {
concurrentSearchEnabled = !clusterMode.equals("none") && aggregationSupportsConcurrent;
}

try (DefaultSearchContext searchContext = service.createSearchContext(request, new TimeValue(System.currentTimeMillis()))) {
SearchContextAggregations mockAggregations = mock(SearchContextAggregations.class);
when(mockAggregations.factories()).thenReturn(mock(AggregatorFactories.class));
when(mockAggregations.factories().allFactoriesSupportConcurrentSearch()).thenReturn(aggregationSupportsConcurrent);

// set the aggregations for context
searchContext.aggregations(mockAggregations);

searchContext.evaluateRequestShouldUseConcurrentSearch();
// check concurrentSearchenabled based on mode and supportedAggregation is computed correctly
assertEquals(concurrentSearchEnabled, searchContext.shouldUseConcurrentSearch());
assertThat(searchContext.searcher().getTaskExecutor(), is(notNullValue()));
}
}

// without aggregations.
{
// Default concurrent search mode is auto, without aggregations, concurrent search will be disabled.
concurrentSearchEnabled = false;
if (indexMode != null) {
concurrentSearchEnabled = indexMode.equals("all");
} else if (clusterMode != null) {
concurrentSearchEnabled = clusterMode.equals("all");
}
try (DefaultSearchContext searchContext = service.createSearchContext(request, new TimeValue(System.currentTimeMillis()))) {
searchContext.evaluateRequestShouldUseConcurrentSearch();
assertEquals(concurrentSearchEnabled, searchContext.shouldUseConcurrentSearch());
assertThat(searchContext.searcher().getTaskExecutor(), is(notNullValue()));
}
}

// Cleanup
client().admin()
.cluster()
.prepareUpdateSettings()
.setTransientSettings(Settings.builder().putNull(SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_MODE.getKey()))
.get();
}

/**
Expand Down
Loading