Skip to content

Default OpenSearch source serverless search context to point_in_time #6756

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

Open
srikanthpadakanti wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

Default OpenSearch source serverless search context to point_in_time #6756

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
4 changes: 2 additions & 2 deletions ...pensearch/dataprepper/plugins/source/opensearch/worker/client/SearchAccessorStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ public SearchAccessor getSearchAccessor() {

private SearchAccessor createSearchAccessorForServerlessCollection(final PluginComponentRefresher clientRefresher) {
if (Objects.isNull(openSearchSourceConfiguration.getSearchConfiguration().getSearchContextType())) {
LOG.info("Configured with AOS serverless flag as true, defaulting to search_context_type as 'none', which uses search_after");
LOG.info("Configured with AOS serverless flag as true, defaulting to search_context_type as 'point_in_time'");
return new OpenSearchAccessor(clientRefresher,
SearchContextType.NONE);
SearchContextType.POINT_IN_TIME);
} else {
if ( SearchContextType.SCROLL.equals(openSearchSourceConfiguration.getSearchConfiguration().getSearchContextType())) {
throw new InvalidPluginConfigurationException("A search_context_type of scroll is not supported for serverless collections");
Expand Down
6 changes: 3 additions & 3 deletions ...nsearch/dataprepper/plugins/source/opensearch/worker/client/SearchAccessStrategyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ void search_context_type_set_to_none_uses_that_search_context_regardless_of_vers
}

@Test
void serverless_flag_true_defaults_to_search_context_type_none() {
void serverless_flag_true_defaults_to_search_context_type_point_in_time() {

final AwsAuthenticationConfiguration awsAuthenticationConfiguration = mock(AwsAuthenticationConfiguration.class);
when(awsAuthenticationConfiguration.isServerlessCollection()).thenReturn(true);
Expand All @@ -222,7 +222,7 @@ void serverless_flag_true_defaults_to_search_context_type_none() {
final SearchAccessor searchAccessor = createObjectUnderTest().getSearchAccessor();

assertThat(searchAccessor, notNullValue());
assertThat(searchAccessor.getSearchContextType(), equalTo(SearchContextType.NONE));
assertThat(searchAccessor.getSearchContextType(), equalTo(SearchContextType.POINT_IN_TIME));
verifyNoInteractions(pluginConfigObservable);
}

Expand All @@ -244,7 +244,7 @@ void serverless_flag_true_throws_InvalidPluginConfiguration_if_search_context_ty
}

@ParameterizedTest
@ValueSource(strings = {"NONE"})
@ValueSource(strings = {"NONE", "POINT_IN_TIME"})
void serverless_flag_true_uses_search_context_type_from_config(final String searchContextType) {

final AwsAuthenticationConfiguration awsAuthenticationConfiguration = mock(AwsAuthenticationConfiguration.class);
Expand Down
Loading
⚡