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

Enable session by default #2373

Merged
merged 2 commits into from
Oct 26, 2023
Merged

Enable session by default #2373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a33789e
enable session by default
penghuo Oct 26, 2023
5d4c204
update doc
penghuo Oct 26, 2023
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
8 changes: 4 additions & 4 deletions docs/user/admin/settings.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,9 @@ plugins.query.executionengine.spark.session.enabled
Description
-----------

By default, execution engine is executed in job mode. You can enable session mode by this setting.
By default, execution engine is executed in session mode. You can disable session mode by this setting.

1. The default value is false.
1. The default value is true.
2. This setting is node scope.
3. This setting can be updated dynamically.

Expand All @@ -328,7 +328,7 @@ You can update the setting with a new value like this.
SQL query::

sh$ curl -sS -H 'Content-Type: application/json' -X PUT localhost:9200/_plugins/_query/settings \
... -d '{"transient":{"plugins.query.executionengine.spark.session.enabled":"true"}}'
... -d '{"transient":{"plugins.query.executionengine.spark.session.enabled":"false"}}'
{
"acknowledged": true,
"persistent": {},
Expand All @@ -338,7 +338,7 @@ SQL query::
"executionengine": {
"spark": {
"session": {
"enabled": "true"
"enabled": "false"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion opensearch/src/main/java/org/opensearch/sql/opensearch/setting/OpenSearchSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public class OpenSearchSettings extends Settings {
public static final Setting<?> SPARK_EXECUTION_SESSION_ENABLED_SETTING =
Setting.boolSetting(
Key.SPARK_EXECUTION_SESSION_ENABLED.getKeyValue(),
false,
true,
Setting.Property.NodeScope,
Setting.Property.Dynamic);

Expand Down
4 changes: 3 additions & 1 deletion spark/src/main/java/org/opensearch/sql/spark/execution/statestore/StateStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ public class StateStore {
public static String SETTINGS_FILE_NAME = "query_execution_request_settings.yml";
public static String MAPPING_FILE_NAME = "query_execution_request_mapping.yml";
public static Function<String, String> DATASOURCE_TO_REQUEST_INDEX =
datasourceName -> String.format("%s_%s", SPARK_REQUEST_BUFFER_INDEX_NAME, datasourceName);
datasourceName ->
String.format(
"%s_%s", SPARK_REQUEST_BUFFER_INDEX_NAME, datasourceName.toLowerCase(Locale.ROOT));

private static final Logger LOG = LogManager.getLogger();

Expand Down
43 changes: 40 additions & 3 deletions .../test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceImplSpecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import lombok.Getter;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.opensearch.action.search.SearchRequest;
import org.opensearch.action.search.SearchResponse;
Expand Down Expand Up @@ -211,9 +212,6 @@ public void withSessionCreateAsyncQueryThenGetResultThenCancel() {
AsyncQueryExecutorService asyncQueryExecutorService =
createAsyncQueryExecutorService(emrsClient);

// enable session
enableSession(true);

// 1. create async query.
CreateAsyncQueryResponse response =
asyncQueryExecutorService.createAsyncQuery(
Expand Down Expand Up @@ -313,6 +311,9 @@ public void interactiveQueryNoTimeout() {
assertEquals(0L, (long) emrsClient.getJobRequest().executionTimeout());
}

@Ignore(
Copy link
Member

Choose a reason for hiding this comment

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

I got this yesterday and succedeed other times.
+1

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

may related to key we used for testing, not our code issue.

"flaky test, java.lang.IllegalArgumentException: Right now only AES/GCM/NoPadding is"
+ " supported")
@Test
public void datasourceWithBasicAuth() {
Map<String, String> properties = new HashMap<>();
Expand Down Expand Up @@ -480,6 +481,42 @@ public void submitQueryInInvalidSessionThrowException() {
assertEquals("no session found. " + sessionId, exception.getMessage());
}

@Test
public void datasourceNameIncludeUppercase() {
dataSourceService.createDataSource(
new DataSourceMetadata(
"TESTS3",
DataSourceType.S3GLUE,
ImmutableList.of(),
ImmutableMap.of(
"glue.auth.type",
"iam_role",
"glue.auth.role_arn",
"arn:aws:iam::924196221507:role/FlintOpensearchServiceRole",
"glue.indexstore.opensearch.uri",
"http://localhost:9200",
"glue.indexstore.opensearch.auth",
"noauth"),
null));

LocalEMRSClient emrsClient = new LocalEMRSClient();
AsyncQueryExecutorService asyncQueryExecutorService =
createAsyncQueryExecutorService(emrsClient);

// enable session
enableSession(true);

CreateAsyncQueryResponse response =
asyncQueryExecutorService.createAsyncQuery(
new CreateAsyncQueryRequest("select 1", "TESTS3", LangType.SQL, null));
String params = emrsClient.getJobRequest().getSparkSubmitParams();

assertNotNull(response.getSessionId());
assertTrue(
params.contains(
"--conf spark.sql.catalog.TESTS3=org.opensearch.sql.FlintDelegatingSessionCatalog"));
}

private DataSourceServiceImpl createDataSourceService() {
String masterKey = "a57d991d9b573f75b9bba1df";
DataSourceMetadataStorage dataSourceMetadataStorage =
Expand Down
Loading