refactor stopService

Committed-by: xiaolei.zl from Dev container

docs/flex/interactive/development/python/python_sdk.md

@@ -361,7 +361,7 @@ Currently Interactive forbid deleting a graph which is currently serving in the
 
 ```python
 # stop the service first
-resp = sess.stop_service()
+resp = sess.stop_service(graph_id)
 assert resp.is_ok()
 print("successfully stopped the service")
 

flex/engines/http_server/actor/admin_actor.act.cc

@@ -1033,15 +1033,47 @@ seastar::future<admin_query_result> admin_actor::start_service(
 // The port is still connectable.
 seastar::future<admin_query_result> admin_actor::stop_service(
     query_param&& query_param) {
+  // Try to get the json content from query_param
+  std::string graph_id = "";
+  try {
+    auto& content = query_param.content;
+    if (!content.empty()) {
+      rapidjson::Document json;
+      if (json.Parse(content.c_str()).HasParseError()) {
+        throw std::runtime_error("Fail to parse json: " +
+                                 std::to_string(json.GetParseError()));
+      }
+      if (json.HasMember("graph_id")) {
+        graph_id = json["graph_id"].GetString();
+      }
+      LOG(INFO) << "Stop service with graph: " << graph_id;
+    }
+  } catch (std::exception& e) {
+    LOG(ERROR) << "Fail to Start service: ";
+    return seastar::make_ready_future<admin_query_result>(
+        gs::Result<seastar::sstring>(
+            gs::Status(gs::StatusCode::BAD_REQUEST,
+                       "Fail to parse json: " + std::string(e.what()))));
+  }
+
   auto& graph_db_service = GraphDBService::get();
-  return graph_db_service.stop_query_actors().then([this] {
+  return graph_db_service.stop_query_actors().then([this, graph_id] {
     LOG(INFO) << "Successfully stopped query handler";
     // Add also remove current running graph
     {
       std::lock_guard<std::mutex> lock(mtx_);
       // unlock the graph
       auto cur_running_graph_res = metadata_store_->GetRunningGraph();
       if (cur_running_graph_res.ok()) {
+        if (!graph_id.empty() && graph_id != cur_running_graph_res.value()) {
+          LOG(ERROR) << "The specified graph is not running: "
+                     << cur_running_graph_res.value();
+          return seastar::make_ready_future<admin_query_result>(
+              gs::Result<seastar::sstring>(
+                  gs::Status(gs::StatusCode::NOT_FOUND,
+                             "The graph is not running: " +
+                                 cur_running_graph_res.value())));
+        }
         auto unlock_res =
             metadata_store_->UnlockGraphIndices(cur_running_graph_res.value());
         if (!unlock_res.ok()) {

flex/interactive/sdk/java/src/main/java/com/alibaba/graphscope/interactive/client/QueryServiceInterface.java

@@ -18,6 +18,7 @@
 import com.alibaba.graphscope.interactive.client.common.Result;
 import com.alibaba.graphscope.interactive.models.ServiceStatus;
 import com.alibaba.graphscope.interactive.models.StartServiceRequest;
+import com.alibaba.graphscope.interactive.models.StopServiceRequest;
 
 /**
  * Manage the query interface.
@@ -29,5 +30,5 @@ public interface QueryServiceInterface {
 
     Result<String> startService(StartServiceRequest service);
 
-    Result<String> stopService();
+    Result<String> stopService(StopServiceRequest graphId);
 }

flex/interactive/sdk/java/src/main/java/com/alibaba/graphscope/interactive/client/impl/DefaultSession.java

@@ -801,9 +801,9 @@ public Result<String> startService(StartServiceRequest service) {
     }
 
     @Override
-    public Result<String> stopService() {
+    public Result<String> stopService(StopServiceRequest request) {
         try {
-            ApiResponse<String> response = serviceApi.stopServiceWithHttpInfo();
+            ApiResponse<String> response = serviceApi.stopServiceWithHttpInfo(request);
             return Result.fromResponse(response);
         } catch (ApiException e) {
             e.printStackTrace();

flex/interactive/sdk/python/gs_interactive/client/session.py

@@ -236,7 +236,7 @@ def start_service(
         raise NotImplementedError
 
     @abstractmethod
-    def stop_service(self) -> Result[str]:
+    def stop_service(self, graph_id: str) -> Result[str]:
         raise NotImplementedError
 
     @abstractmethod
@@ -656,9 +656,9 @@ def start_service(
         except Exception as e:
             return Result.from_exception(e)
 
-    def stop_service(self) -> Result[str]:
+    def stop_service(self, graph_id : str = None) -> Result[str]:
         try:
-            response = self._service_api.stop_service_with_http_info()
+            response = self._service_api.stop_service_with_http_info(StopServiceRequest(graph_id = graph_id))
             return Result.from_response(response)
         except Exception as e:
             return Result.from_exception(e)

flex/interactive/sdk/python/gs_interactive/tests/test_robustness.py

@@ -135,4 +135,10 @@ def test_builtin_procedure(interactive_session,neo4j_session, create_modern_grap
     # Call the builtin procedure
     start_service_on_graph(interactive_session, create_modern_graph)
     call_procedure(neo4j_session, create_modern_graph, "count_vertices", '"person"')
-
+
+def test_stop_service(interactive_session, create_modern_graph):
+    print("[Test stop service]")
+    start_service_on_graph(interactive_session, create_modern_graph)
+    # stop the service
+    stop_res = interactive_session.stop_service(graph_id = "A Invalid graph id")
+    assert not stop_res.is_ok()

flex/openapi/openapi_interactive.yaml

@@ -530,6 +530,12 @@ paths:
         - AdminService/ServiceManagement
       description: Stop current service
       operationId: stop_service
+      requestBody:
+        description: Start service on a specified graph
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/StopServiceRequest'
       responses:
         '200':
           description: successful operation
@@ -2015,6 +2021,13 @@ components:
       properties:
         graph_id:
           type: string
+    StopServiceRequest:
+      x-body-name: stop_service_request
+      properties:
+        graph_id:
+          type: string
+          nullable: true
+      additionalProperties: false
     ServiceStatus:
       x-body-name: service_status
       type: object