Revert "add concurrent limit on datasource and sessions (opensearch-p…

…roject#2390) (opensearch-project#2395)" This reverts commit deb3ccf. Signed-off-by: Eric <[email protected]>
mengweieric · Nov 8, 2023 · 037d245 · 037d245
1 parent d737bfd
commit 037d245
Show file tree

Hide file tree

Showing 23 changed files with 251 additions and 649 deletions.
diff --git a/common/src/main/java/org/opensearch/sql/common/setting/Settings.java b/common/src/main/java/org/opensearch/sql/common/setting/Settings.java
@@ -34,7 +34,6 @@ public enum Key {
     QUERY_SIZE_LIMIT("plugins.query.size_limit"),
     ENCYRPTION_MASTER_KEY("plugins.query.datasources.encryption.masterkey"),
     DATASOURCES_URI_HOSTS_DENY_LIST("plugins.query.datasources.uri.hosts.denylist"),
-    DATASOURCES_LIMIT("plugins.query.datasources.limit"),
 
     METRICS_ROLLING_WINDOW("plugins.query.metrics.rolling_window"),
     METRICS_ROLLING_INTERVAL("plugins.query.metrics.rolling_interval"),

diff --git a/datasources/build.gradle b/datasources/build.gradle
@@ -16,7 +16,6 @@ repositories {
 dependencies {
     implementation project(':core')
     implementation project(':protocol')
-    implementation project(':opensearch')
     implementation group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
     implementation group: 'org.opensearch', name: 'opensearch-x-content', version: "${opensearch_version}"
     implementation group: 'org.opensearch', name: 'common-utils', version: "${opensearch_build}"
@@ -36,7 +35,7 @@ dependencies {
 test {
     useJUnitPlatform()
     testLogging {
-        events "skipped", "failed"
+        events "passed", "skipped", "failed"
         exceptionFormat "full"
     }
 }

diff --git a/...c/main/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceAction.java b/...c/main/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceAction.java
@@ -7,7 +7,6 @@
 
 package org.opensearch.sql.datasources.transport;
 
-import static org.opensearch.sql.common.setting.Settings.Key.DATASOURCES_LIMIT;
 import static org.opensearch.sql.protocol.response.format.JsonResponseFormatter.Style.PRETTY;
 
 import org.opensearch.action.ActionType;
@@ -31,7 +30,6 @@ public class TransportCreateDataSourceAction
       new ActionType<>(NAME, CreateDataSourceActionResponse::new);
 
   private DataSourceService dataSourceService;
-  private org.opensearch.sql.opensearch.setting.OpenSearchSettings settings;
 
   /**
    * TransportCreateDataSourceAction action for creating datasource.
@@ -44,44 +42,33 @@ public class TransportCreateDataSourceAction
   public TransportCreateDataSourceAction(
       TransportService transportService,
       ActionFilters actionFilters,
-      DataSourceServiceImpl dataSourceService,
-      org.opensearch.sql.opensearch.setting.OpenSearchSettings settings) {
+      DataSourceServiceImpl dataSourceService) {
     super(
         TransportCreateDataSourceAction.NAME,
         transportService,
         actionFilters,
         CreateDataSourceActionRequest::new);
     this.dataSourceService = dataSourceService;
-    this.settings = settings;
   }
 
   @Override
   protected void doExecute(
       Task task,
       CreateDataSourceActionRequest request,
       ActionListener<CreateDataSourceActionResponse> actionListener) {
-    int dataSourceLimit = settings.getSettingValue(DATASOURCES_LIMIT);
-    if (dataSourceService.getDataSourceMetadata(false).size() >= dataSourceLimit) {
-      actionListener.onFailure(
-          new IllegalStateException(
-              String.format(
-                  "domain concurrent datasources can not" + " exceed %d", dataSourceLimit)));
-    } else {
-      try {
-
-        DataSourceMetadata dataSourceMetadata = request.getDataSourceMetadata();
-        dataSourceService.createDataSource(dataSourceMetadata);
-        String responseContent =
-            new JsonResponseFormatter<String>(PRETTY) {
-              @Override
-              protected Object buildJsonObject(String response) {
-                return response;
-              }
-            }.format("Created DataSource with name " + dataSourceMetadata.getName());
-        actionListener.onResponse(new CreateDataSourceActionResponse(responseContent));
-      } catch (Exception e) {
-        actionListener.onFailure(e);
-      }
+    try {
+      DataSourceMetadata dataSourceMetadata = request.getDataSourceMetadata();
+      dataSourceService.createDataSource(dataSourceMetadata);
+      String responseContent =
+          new JsonResponseFormatter<String>(PRETTY) {
+            @Override
+            protected Object buildJsonObject(String response) {
+              return response;
+            }
+          }.format("Created DataSource with name " + dataSourceMetadata.getName());
+      actionListener.onResponse(new CreateDataSourceActionResponse(responseContent));
+    } catch (Exception e) {
+      actionListener.onFailure(e);
     }
   }
 }
diff --git a/...st/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceActionTest.java b/...st/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceActionTest.java
@@ -1,19 +1,14 @@
 package org.opensearch.sql.datasources.transport;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.opensearch.sql.common.setting.Settings.Key.DATASOURCES_LIMIT;
 
 import java.util.HashSet;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
@@ -26,7 +21,6 @@
 import org.opensearch.sql.datasources.model.transport.CreateDataSourceActionRequest;
 import org.opensearch.sql.datasources.model.transport.CreateDataSourceActionResponse;
 import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
-import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
 import org.opensearch.tasks.Task;
 import org.opensearch.transport.TransportService;
 
@@ -35,13 +29,9 @@ public class TransportCreateDataSourceActionTest {
 
   @Mock private TransportService transportService;
   @Mock private TransportCreateDataSourceAction action;
-
-  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-  private DataSourceServiceImpl dataSourceService;
-
+  @Mock private DataSourceServiceImpl dataSourceService;
   @Mock private Task task;
   @Mock private ActionListener<CreateDataSourceActionResponse> actionListener;
-  @Mock private OpenSearchSettings settings;
 
   @Captor
   private ArgumentCaptor<CreateDataSourceActionResponse>
@@ -53,9 +43,7 @@ public class TransportCreateDataSourceActionTest {
   public void setUp() {
     action =
         new TransportCreateDataSourceAction(
-            transportService, new ActionFilters(new HashSet<>()), dataSourceService, settings);
-    when(dataSourceService.getDataSourceMetadata(false).size()).thenReturn(1);
-    when(settings.getSettingValue(DATASOURCES_LIMIT)).thenReturn(20);
+            transportService, new ActionFilters(new HashSet<>()), dataSourceService);
   }
 
   @Test
@@ -91,30 +79,4 @@ public void testDoExecuteWithException() {
     Assertions.assertTrue(exception instanceof RuntimeException);
     Assertions.assertEquals("Error", exception.getMessage());
   }
-
-  @Test
-  public void testDataSourcesLimit() {
-    DataSourceMetadata dataSourceMetadata = new DataSourceMetadata();
-    dataSourceMetadata.setName("test_datasource");
-    dataSourceMetadata.setConnector(DataSourceType.PROMETHEUS);
-    CreateDataSourceActionRequest request = new CreateDataSourceActionRequest(dataSourceMetadata);
-    when(dataSourceService.getDataSourceMetadata(false).size()).thenReturn(1);
-    when(settings.getSettingValue(DATASOURCES_LIMIT)).thenReturn(1);
-
-    action.doExecute(
-        task,
-        request,
-        new ActionListener<CreateDataSourceActionResponse>() {
-          @Override
-          public void onResponse(CreateDataSourceActionResponse createDataSourceActionResponse) {
-            fail();
-          }
-
-          @Override
-          public void onFailure(Exception e) {
-            assertEquals("domain concurrent datasources can not exceed 1", e.getMessage());
-          }
-        });
-    verify(dataSourceService, times(0)).createDataSource(dataSourceMetadata);
-  }
 }
diff --git a/docs/user/admin/settings.rst b/docs/user/admin/settings.rst
@@ -348,12 +348,12 @@ SQL query::
     }
 
 plugins.query.executionengine.spark.session.limit
-==================================================
+===================================================
 
 Description
 -----------
 
-Each cluster can have maximum 100 sessions running in parallel by default. You can increase limit by this setting.
+Each datasource can have maximum 100 sessions running in parallel by default. You can increase limit by this setting.
 
 1. The default value is 100.
 2. This setting is node scope.
@@ -383,36 +383,3 @@ SQL query::
       }
     }
 
-
-plugins.query.datasources.limit
-===============================
-
-Description
------------
-
-Each cluster can have maximum 20 datasources. You can increase limit by this setting.
-
-1. The default value is 20.
-2. This setting is node scope.
-3. This setting can be updated dynamically.
-
-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.datasources.limit":25}}'
-    {
-      "acknowledged": true,
-      "persistent": {},
-      "transient": {
-        "plugins": {
-          "query": {
-            "datasources": {
-              "limit": "25"
-            }
-          }
-        }
-      }
-    }
-
diff --git a/integ-test/src/test/java/org/opensearch/sql/datasource/DataSourceAPIsIT.java b/integ-test/src/test/java/org/opensearch/sql/datasource/DataSourceAPIsIT.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
-import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Test;
@@ -35,11 +34,6 @@
 
 public class DataSourceAPIsIT extends PPLIntegTestCase {
 
-  @After
-  public void cleanUp() throws IOException {
-    wipeAllClusterSettings();
-  }
-
   @AfterClass
   protected static void deleteDataSourcesCreated() throws IOException {
     Request deleteRequest = getDeleteDataSourceRequest("create_prometheus");
@@ -57,10 +51,6 @@ protected static void deleteDataSourcesCreated() throws IOException {
     deleteRequest = getDeleteDataSourceRequest("Create_Prometheus");
     deleteResponse = client().performRequest(deleteRequest);
     Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
-
-    deleteRequest = getDeleteDataSourceRequest("duplicate_prometheus");
-    deleteResponse = client().performRequest(deleteRequest);
-    Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
   }
 
   @SneakyThrows
@@ -293,45 +283,4 @@ public void issue2196() {
     Assert.assertNull(dataSourceMetadata.getProperties().get("prometheus.auth.password"));
     Assert.assertEquals("Prometheus Creation for Integ test", dataSourceMetadata.getDescription());
   }
-
-  @Test
-  public void datasourceLimitTest() throws InterruptedException, IOException {
-    DataSourceMetadata d1 = mockDataSourceMetadata("duplicate_prometheus");
-    Request createRequest = getCreateDataSourceRequest(d1);
-    Response response = client().performRequest(createRequest);
-    Assert.assertEquals(201, response.getStatusLine().getStatusCode());
-    // Datasource is not immediately created. so introducing a sleep of 2s.
-    Thread.sleep(2000);
-
-    updateClusterSettings(new ClusterSetting(TRANSIENT, "plugins.query.datasources.limit", "1"));
-
-    DataSourceMetadata d2 = mockDataSourceMetadata("d2");
-    ResponseException exception =
-        Assert.assertThrows(
-            ResponseException.class, () -> client().performRequest(getCreateDataSourceRequest(d2)));
-    Assert.assertEquals(400, exception.getResponse().getStatusLine().getStatusCode());
-    String prometheusGetResponseString = getResponseBody(exception.getResponse());
-    JsonObject errorMessage = new Gson().fromJson(prometheusGetResponseString, JsonObject.class);
-    Assert.assertEquals(
-        "domain concurrent datasources can not exceed 1",
-        errorMessage.get("error").getAsJsonObject().get("details").getAsString());
-  }
-
-  public DataSourceMetadata mockDataSourceMetadata(String name) {
-    return new DataSourceMetadata(
-        name,
-        "Prometheus Creation for Integ test",
-        DataSourceType.PROMETHEUS,
-        ImmutableList.of(),
-        ImmutableMap.of(
-            "prometheus.uri",
-            "https://localhost:9090",
-            "prometheus.auth.type",
-            "basicauth",
-            "prometheus.auth.username",
-            "username",
-            "prometheus.auth.password",
-            "password"),
-        null);
-  }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/OpenSearchSettings.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/OpenSearchSettings.java
@@ -172,13 +172,6 @@ public class OpenSearchSettings extends Settings {
           Setting.Property.NodeScope,
           Setting.Property.Dynamic);
 
-  public static final Setting<?> DATASOURCES_LIMIT_SETTING =
-      Setting.intSetting(
-          Key.DATASOURCES_LIMIT.getKeyValue(),
-          20,
-          Setting.Property.NodeScope,
-          Setting.Property.Dynamic);
-
   /** Construct OpenSearchSetting. The OpenSearchSetting must be singleton. */
   @SuppressWarnings("unchecked")
   public OpenSearchSettings(ClusterSettings clusterSettings) {
@@ -279,12 +272,6 @@ public OpenSearchSettings(ClusterSettings clusterSettings) {
         Key.AUTO_INDEX_MANAGEMENT_ENABLED,
         AUTO_INDEX_MANAGEMENT_ENABLED_SETTING,
         new Updater(Key.AUTO_INDEX_MANAGEMENT_ENABLED));
-    register(
-        settingBuilder,
-        clusterSettings,
-        Key.DATASOURCES_LIMIT,
-        DATASOURCES_LIMIT_SETTING,
-        new Updater(Key.DATASOURCES_LIMIT));
     registerNonDynamicSettings(
         settingBuilder, clusterSettings, Key.CLUSTER_NAME, ClusterName.CLUSTER_NAME_SETTING);
     defaultSettings = settingBuilder.build();
@@ -355,7 +342,6 @@ public static List<Setting<?>> pluginSettings() {
         .add(SESSION_INDEX_TTL_SETTING)
         .add(RESULT_INDEX_TTL_SETTING)
         .add(AUTO_INDEX_MANAGEMENT_ENABLED_SETTING)
-        .add(DATASOURCES_LIMIT_SETTING)
         .build();
   }
 

diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/SQLPlugin.java b/plugin/src/main/java/org/opensearch/sql/plugin/SQLPlugin.java
@@ -98,7 +98,6 @@
 import org.opensearch.sql.spark.execution.session.SessionManager;
 import org.opensearch.sql.spark.execution.statestore.StateStore;
 import org.opensearch.sql.spark.flint.FlintIndexMetadataReaderImpl;
-import org.opensearch.sql.spark.leasemanager.DefaultLeaseManager;
 import org.opensearch.sql.spark.response.JobExecutionResponseReader;
 import org.opensearch.sql.spark.rest.RestAsyncQueryManagementAction;
 import org.opensearch.sql.spark.storage.SparkStorageFactory;
@@ -259,7 +258,7 @@ public Collection<Object> createComponents(
             OpenSearchSettings.AUTO_INDEX_MANAGEMENT_ENABLED_SETTING,
             environment.settings());
     return ImmutableList.of(
-        dataSourceService, asyncQueryExecutorService, clusterManagerEventListener, pluginSettings);
+        dataSourceService, asyncQueryExecutorService, clusterManagerEventListener);
   }
 
   @Override
@@ -334,8 +333,7 @@ private AsyncQueryExecutorService createAsyncQueryExecutorService(
             jobExecutionResponseReader,
             new FlintIndexMetadataReaderImpl(client),
             client,
-            new SessionManager(stateStore, emrServerlessClient, pluginSettings),
-            new DefaultLeaseManager(pluginSettings, stateStore));
+            new SessionManager(stateStore, emrServerlessClient, pluginSettings));
     return new AsyncQueryExecutorServiceImpl(
         asyncQueryJobMetadataStorageService,
         sparkQueryDispatcher,

diff --git a/spark/src/main/java/org/opensearch/sql/spark/dispatcher/AsyncQueryHandler.java b/spark/src/main/java/org/opensearch/sql/spark/dispatcher/AsyncQueryHandler.java
@@ -12,9 +12,6 @@
 import com.amazonaws.services.emrserverless.model.JobRunState;
 import org.json.JSONObject;
 import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
-import org.opensearch.sql.spark.dispatcher.model.DispatchQueryContext;
-import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
-import org.opensearch.sql.spark.dispatcher.model.DispatchQueryResponse;
 
 /** Process async query request. */
 public abstract class AsyncQueryHandler {
@@ -48,8 +45,5 @@ protected abstract JSONObject getResponseFromResultIndex(
   protected abstract JSONObject getResponseFromExecutor(
       AsyncQueryJobMetadata asyncQueryJobMetadata);
 
-  public abstract String cancelJob(AsyncQueryJobMetadata asyncQueryJobMetadata);
-
-  public abstract DispatchQueryResponse submit(
-      DispatchQueryRequest request, DispatchQueryContext context);
+  abstract String cancelJob(AsyncQueryJobMetadata asyncQueryJobMetadata);
 }