Merge branch 'fix_bug_start_stop_api' into 'master'

Fix bug start stop api

See merge request oceanbase/ob-deploy!478

Author: gys-git

service/api/v1/deployments.py

@@ -123,6 +123,18 @@ async def start(name: str, background_tasks: BackgroundTasks):
         return response_utils.new_internal_server_error_exception(ex)
     return response_utils.new_ok_response("")
 
+@router.get("/deployments/{name}/start",
+            response_model=OBResponse[TaskInfo],
+            description='query start status',
+            operation_id='queryStartStatus',
+            tags=['Deployments'])
+async def get_start_status(name: str = Path(description='deployment name')):
+    handler = handler_utils.new_deployment_handler()
+    task_info = handler.get_start_task_info(name)
+    if task_info is None:
+        return response_utils.new_not_found_exception("task {0} not found".format(name))
+    return response_utils.new_ok_response(task_info)
+
 @router.get("/deployments/{name}/start/log",
             response_model=OBResponse[InstallLog],
             description='query start log',
@@ -154,6 +166,18 @@ async def stop(name: str, background_tasks: BackgroundTasks):
         return response_utils.new_internal_server_error_exception(ex)
     return response_utils.new_ok_response("")
 
+@router.get("/deployments/{name}/stop",
+            response_model=OBResponse[TaskInfo],
+            description='query stop status',
+            operation_id='queryStopStatus',
+            tags=['Deployments'])
+async def get_start_status(name: str = Path(description='deployment name')):
+    handler = handler_utils.new_deployment_handler()
+    task_info = handler.get_stop_task_info(name)
+    if task_info is None:
+        return response_utils.new_not_found_exception("task {0} not found".format(name))
+    return response_utils.new_ok_response(task_info)
+
 @router.get("/deployments/{name}/stop/log",
             response_model=OBResponse[InstallLog],
             description='query stop log',

service/common/const.py

@@ -48,6 +48,7 @@
 DESTROY_PLUGIN = "destroy"
 INIT_PLUGINS = ("init",)
 START_PLUGINS = ("start_check_pre", "start", "connect", "health_check", "display")
+STOP_PLUGINS = ("stop",)
 DEL_COMPONENT_PLUGINS = ("stop", "destroy")
 CHANGED_COMPONENTS = ('obproxy-ce', 'obagent', 'ob-configserver', 'prometheus', 'grafana')
 UPGRADE_PLUGINS = ("upgrade")
@@ -64,3 +65,6 @@
 
 GRACEFUL_TIMEOUT = 5
 
+TASK_TYPE_INSTALL = 'install'
+TASK_TYPE_START = 'start'
+TASK_TYPE_STOP = 'stop'

service/handler/deployment_handler.py

@@ -573,7 +573,7 @@ def _do_start(self, name):
         LocalClient.execute_command_background("nohup obd telemetry post %s --data='%s' > /dev/null &" % (name, json.dumps(data)))
 
     def get_start_task_info(self, name):
-        return self.get_task_info_log(name, "start")
+        return self.get_task_info_log_by_type(name, "start")
 
     @serial("stop")
     def stop(self, name, background_tasks):
@@ -585,7 +585,7 @@ def stop(self, name, background_tasks):
         background_tasks.add_task(self._do_stop, name)
 
     def get_stop_task_info(self, name):
-        return self.get_task_info_log(name, "stop")
+        return self.get_task_info_log_by_type(name, "stop")
 
     @auto_register("stop")
     def _do_stop(self, name):
@@ -603,43 +603,68 @@ def _do_stop(self, name):
             data[component] = _.get_variable('run_result')
         LocalClient.execute_command_background("nohup obd telemetry post %s --data='%s' > /dev/null &" % (name, json.dumps(data)))
 
-    def get_task_info_log(self, name, task_type):
+    def get_task_info_log_by_type(self, name, task_type):
         task_info = task.get_task_manager().get_task_info(name, task_type=task_type)
         if task_info is None:
             raise Exception("task {0} not found".format(name))
         deploy = self.get_deploy(name)
         components = deploy.deploy_config.components
-        total_count = (len(const.START_PLUGINS) + len(const.INIT_PLUGINS)) * len(components)
+        total_count = 0
+        if task_type == const.TASK_TYPE_INSTALL:
+            total_count = (len(const.START_PLUGINS) + len(const.INIT_PLUGINS)) * len(components)
+        elif task_type == const.TASK_TYPE_START:
+            total_count = len(const.START_PLUGINS) * len(components)
+        elif task_type == const.TASK_TYPE_STOP:
+            total_count = len(const.STOP_PLUGINS) * len(components)
         finished_count = 0
         current = ""
         task_result = TaskResult.RUNNING
         info_dict = dict()
 
         for component in components:
-            info_dict[component] = ComponentInfo(component=component, status=TaskStatus.PENDING,
-                                                 result=TaskResult.RUNNING)
-            if component in self.obd.namespaces:
-                for plugin in const.INIT_PLUGINS:
+                info_dict[component] = ComponentInfo(component=component, status=TaskStatus.PENDING,
+                                                    result=TaskResult.RUNNING)
+
+        if task_type == const.TASK_TYPE_INSTALL:
+            for component in components:
+                if component in self.obd.namespaces:
+                    for plugin in const.INIT_PLUGINS:
+                        if self.obd.namespaces[component].get_return(plugin) is not None:
+                            info_dict[component].status = TaskStatus.RUNNING
+                            finished_count += 1
+                            current = "{0}: {1} finished".format(component, plugin)
+                            if not self.obd.namespaces[component].get_return(plugin):
+                                info_dict[component].result = TaskResult.FAILED
+
+        if task_type == const.TASK_TYPE_INSTALL or task_type == const.TASK_TYPE_START:
+            for component in components:
+                for plugin in const.START_PLUGINS:
+                    if component not in self.obd.namespaces:
+                        break
                     if self.obd.namespaces[component].get_return(plugin) is not None:
                         info_dict[component].status = TaskStatus.RUNNING
                         finished_count += 1
                         current = "{0}: {1} finished".format(component, plugin)
                         if not self.obd.namespaces[component].get_return(plugin):
                             info_dict[component].result = TaskResult.FAILED
-
-        for component in components:
-            for plugin in const.START_PLUGINS:
-                if component not in self.obd.namespaces:
-                    break
-                if self.obd.namespaces[component].get_return(plugin) is not None:
-                    info_dict[component].status = TaskStatus.RUNNING
-                    finished_count += 1
-                    current = "{0}: {1} finished".format(component, plugin)
-                    if not self.obd.namespaces[component].get_return(plugin):
-                        info_dict[component].result = TaskResult.FAILED
-                    else:
-                        if plugin == const.START_PLUGINS[-1]:
-                            info_dict[component].result = TaskResult.SUCCESSFUL
+                        else:
+                            if plugin == const.START_PLUGINS[-1]:
+                                info_dict[component].result = TaskResult.SUCCESSFUL
+
+        if task_type == const.TASK_TYPE_STOP:
+            for component in components:
+                for plugin in const.STOP_PLUGINS:
+                    if component not in self.obd.namespaces:
+                        break
+                    if self.obd.namespaces[component].get_return(plugin) is not None:
+                        info_dict[component].status = TaskStatus.RUNNING
+                        finished_count += 1
+                        current = "{0}: {1} finished".format(component, plugin)
+                        if not self.obd.namespaces[component].get_return(plugin):
+                            info_dict[component].result = TaskResult.FAILED
+                        else:
+                            if plugin == const.STOP_PLUGINS[-1]:
+                                info_dict[component].result = TaskResult.SUCCESSFUL
 
         if task_info.status == TaskStatus.FINISHED:
             task_result = task_info.result
@@ -655,7 +680,7 @@ def get_task_info_log(self, name, task_type):
                         msg=msg)
 
     def get_install_task_info(self, name):
-        return self.get_task_info_log(name, "install")
+        return self.get_task_info_log_by_type(name, "install")
 
     def __build_connection_info(self, component, info):
         if info is None: