[Improve] DistributedTask enums improvements

apache · Sep 29, 2024 · 185859e · 185859e
1 parent 0509c0b
commit 185859e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/...e-service/src/main/java/org/apache/streampark/console/core/enums/DistributedTaskEnum.java b/...e-service/src/main/java/org/apache/streampark/console/core/enums/DistributedTaskEnum.java
@@ -47,15 +47,10 @@ public enum DistributedTaskEnum {
      */
     ABORT(4),
 
-    /**
-     * Stop the given application.
-     */
-    STOP(5),
-
     /**
      * Forces the given application to stop.
      */
-    FORCED_STOP(6);
+    FORCED_STOP(5);
 
     private final int value;
 

diff --git a/...e/streampark/console/core/service/application/impl/SparkApplicationActionServiceImpl.java b/...e/streampark/console/core/service/application/impl/SparkApplicationActionServiceImpl.java
@@ -205,7 +205,7 @@ public void forcedStop(Long id) {
     public void cancel(SparkApplication appParam) throws Exception {
         // For HA purposes, if the task is not processed locally, save the Distribution task and return
         if (!distributedTaskService.isLocalProcessing(appParam.getId())) {
-            distributedTaskService.saveDistributedTask(appParam, false, DistributedTaskEnum.STOP);
+            distributedTaskService.saveDistributedTask(appParam, false, DistributedTaskEnum.CANCEL);
             return;
         }
         SparkAppHttpWatcher.setOptionState(appParam.getId(), SparkOptionStateEnum.STOPPING);

diff --git a/...main/java/org/apache/streampark/console/core/service/impl/DistributedTaskServiceImpl.java b/...main/java/org/apache/streampark/console/core/service/impl/DistributedTaskServiceImpl.java
@@ -159,7 +159,7 @@ public void executeDistributedTask(DistributedTask distributedTask) throws Excep
                 case REVOKE:
                     sparkApplicationActionService.revoke(appParam.getId());
                     break;
-                case STOP:
+                case CANCEL:
                     sparkApplicationActionService.cancel(appParam);
                     break;
                 case FORCED_STOP: