From 3fceee95703a37256c54ba9131da30ea61b444eb Mon Sep 17 00:00:00 2001
From: Zhou Zheng <1606079777@qq.comom>
Date: Thu, 23 Jul 2020 22:50:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E5=BC=BA=E5=88=B6=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E7=9A=84=E8=8A=82=E7=82=B9=E5=A4=84=E5=90=AF=E5=8A=A8-apiserve?=
 =?UTF-8?q?r=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 新添加executeType
2. 新添加对应的commandType
3. 修改controller对应的service部分
4. 补充processService中的verifyIsNeedCreateCommand的判断逻辑
---
 .../org/apache/dolphinscheduler/api/enums/ExecuteType.java   | 3 ++-
 .../apache/dolphinscheduler/api/service/ExecutorService.java | 5 +++++
 .../apache/dolphinscheduler/common/enums/CommandType.java    | 4 +++-
 .../dolphinscheduler/service/process/ProcessService.java     | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/ExecuteType.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/ExecuteType.java
index cc1797295a..d5dfa3148e 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/ExecuteType.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/ExecuteType.java
@@ -29,8 +29,9 @@ public enum ExecuteType {
      * 3 resume failure
      * 4 stop
      * 5 pause
+     * 6 resume from forced success
      */
-    NONE,REPEAT_RUNNING, RECOVER_SUSPENDED_PROCESS, START_FAILURE_TASK_PROCESS, STOP, PAUSE;
+    NONE,REPEAT_RUNNING, RECOVER_SUSPENDED_PROCESS, START_FAILURE_TASK_PROCESS, STOP, PAUSE, RESUME_FROM_FORCED_SUCCESS;
 
 
     public static ExecuteType getEnum(int value){
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index 6a8dad4f2a..0d67617904 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -17,6 +17,7 @@
 package org.apache.dolphinscheduler.api.service;
 
 
+import com.sun.org.apache.bcel.internal.generic.BREAKPOINT;
 import org.apache.dolphinscheduler.api.enums.ExecuteType;
 import org.apache.dolphinscheduler.api.enums.Status;
 import org.apache.dolphinscheduler.common.Constants;
@@ -264,6 +265,9 @@ public class ExecutorService extends BaseService{
                     result = updateProcessInstancePrepare(processInstance, CommandType.PAUSE, ExecutionStatus.READY_PAUSE);
                 }
                 break;
+            case RESUME_FROM_FORCED_SUCCESS:
+                result = insertCommand(loginUser, processInstanceId, processDefinition.getId(), CommandType.RESUME_FROM_FORCED_SUCCESS);
+                break;
             default:
                 logger.error("unknown execute type : {}", executeType);
                 putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "unknown execute type");
@@ -310,6 +314,7 @@ public class ExecutorService extends BaseService{
                 }
                 break;
             case START_FAILURE_TASK_PROCESS:
+            case RESUME_FROM_FORCED_SUCCESS:
                 if (executionStatus.typeIsFailure()) {
                     checkResult = true;
                 }
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
index 9682016d6f..3b663bc74d 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
@@ -39,6 +39,7 @@ public enum CommandType {
      * 8 pause a process
      * 9 stop a process
      * 10 recover waiting thread
+     * 11 resume process from forced-success task nodes
      */
     START_PROCESS(0, "start a new process"),
     START_CURRENT_TASK_PROCESS(1, "start a new process from current nodes"),
@@ -50,7 +51,8 @@ public enum CommandType {
     REPEAT_RUNNING(7, "repeat running a process"),
     PAUSE(8, "pause a process"),
     STOP(9, "stop a process"),
-    RECOVER_WAITTING_THREAD(10, "recover waiting thread");
+    RECOVER_WAITTING_THREAD(10, "recover waiting thread"),
+    RESUME_FROM_FORCED_SUCCESS(11, "resume process from forced-success task nodes");
 
     CommandType(int code, String descp){
         this.code = code;
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index 769fe0928a..21de9f04d7 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -200,6 +200,7 @@ public class ProcessService {
         cmdTypeMap.put(CommandType.REPEAT_RUNNING,1);
         cmdTypeMap.put(CommandType.RECOVER_SUSPENDED_PROCESS,1);
         cmdTypeMap.put(CommandType.START_FAILURE_TASK_PROCESS,1);
+        cmdTypeMap.put(CommandType.RESUME_FROM_FORCED_SUCCESS,1);
         CommandType commandType = command.getCommandType();
 
         if(cmdTypeMap.containsKey(commandType)){