[incubator-dolphinscheduler] branch dev updated: deleted invalid code as assigned in issue 4215 (#4221)

[ki...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 426eb9a  deleted invalid code as assigned in issue 4215 (#4221)
426eb9a is described below

commit 426eb9af034ff481f22d5da0a03662f6c9c7e32c
Author: Saksham Gupta <sa...@gmail.com>
AuthorDate: Sun Dec 13 20:35:27 2020 +0530

    deleted invalid code as assigned in issue 4215 (#4221)
    
    deleted the code at following two places:
    org.apache.dolphinscheduler.service.process.ProcessService#checkTaskExistsInTaskQueue
    org.apache.dolphinscheduler.service.process.ProcessService#taskZkInfo
---
 .../service/process/ProcessService.java            | 44 ----------------------
 1 file changed, 44 deletions(-)

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 6262985..1499004 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
@@ -1172,33 +1172,6 @@ public class ProcessService {
     }
 
     /**
-     * ${processInstancePriority}_${processInstanceId}_${taskInstancePriority}_${taskInstanceId}_${task executed by ip1},${ip2}...
-     * The tasks with the highest priority are selected by comparing the priorities of the above four levels from high to low.
-     *
-     * @param taskInstance taskInstance
-     * @return task zk queue str
-     */
-    public String taskZkInfo(TaskInstance taskInstance) {
-
-        String taskWorkerGroup = getTaskWorkerGroup(taskInstance);
-        ProcessInstance processInstance = this.findProcessInstanceById(taskInstance.getProcessInstanceId());
-        if (processInstance == null) {
-            logger.error("process instance is null. please check the task info, task id: " + taskInstance.getId());
-            return "";
-        }
-
-        StringBuilder sb = new StringBuilder(100);
-
-        sb.append(processInstance.getProcessInstancePriority().ordinal()).append(Constants.UNDERLINE)
-            .append(taskInstance.getProcessInstanceId()).append(Constants.UNDERLINE)
-            .append(taskInstance.getTaskInstancePriority().ordinal()).append(Constants.UNDERLINE)
-            .append(taskInstance.getId()).append(Constants.UNDERLINE)
-            .append(taskInstance.getWorkerGroup());
-
-        return sb.toString();
-    }
-
-    /**
      * get submit task instance state by the work process state
      * cannot modify the task state when running/kill/submit success, or this
      * task instance is already exists in task queue .
@@ -1219,7 +1192,6 @@ public class ProcessService {
             state == ExecutionStatus.RUNNING_EXECUTION
                 || state == ExecutionStatus.DELAY_EXECUTION
                 || state == ExecutionStatus.KILL
-                || checkTaskExistsInTaskQueue(taskInstance)
         ) {
             return state;
         }
@@ -1259,22 +1231,6 @@ public class ProcessService {
     }
 
     /**
-     * check the task instance existing in queue
-     *
-     * @param taskInstance taskInstance
-     * @return whether taskinstance exists queue
-     */
-    public boolean checkTaskExistsInTaskQueue(TaskInstance taskInstance) {
-        if (taskInstance.isSubProcess()) {
-            return false;
-        }
-
-        String taskZkInfo = taskZkInfo(taskInstance);
-
-        return false;
-    }
-
-    /**
      * create a new process instance
      *
      * @param processInstance processInstance