You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by te...@apache.org on 2020/02/22 07:30:41 UTC

[incubator-dolphinscheduler] branch refactor-worker updated (9d89eb0 -> 1b95314)

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

technoboy pushed a change to branch refactor-worker
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.


    from 9d89eb0  TaskExecutionContext create modify (#1994)
     add d6ea202  Refactor worker (#1)
     add 64d538e  updates
     add 9f1865b  Merge branch 'refactor-worker' into refactor-worker
     new 1b95314  Merge branch 'refactor-worker' into refactor-worker

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java  | 1 -
 1 file changed, 1 deletion(-)


[incubator-dolphinscheduler] 01/01: Merge branch 'refactor-worker' into refactor-worker

Posted by te...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 1b95314998345202ee07fb35f330c612c4abd482
Merge: 9d89eb0 9f1865b
Author: Tboy <te...@yeah.net>
AuthorDate: Sat Feb 22 15:30:32 2020 +0800

    Merge branch 'refactor-worker' into refactor-worker

 .../dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java  | 1 -
 1 file changed, 1 deletion(-)

diff --cc dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
index 0167839,d704629..7106cc6
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
@@@ -204,7 -195,35 +204,6 @@@ public class MasterBaseTaskExecThread i
          return false;
      }
  
 -
 -    /**
 -     * taskInstance convert to taskInfo
 -     *
 -     * @param taskInstance taskInstance
 -     * @return taskInfo
 -     */
 -    private TaskExecutionContext convertToTaskInfo(TaskInstance taskInstance){
 -        TaskExecutionContext taskExecutionContext = new TaskExecutionContext();
 -        taskExecutionContext.setTaskId(taskInstance.getId());
 -        taskExecutionContext.setTaskName(taskInstance.getName());
 -        taskExecutionContext.setStartTime(taskInstance.getStartTime());
 -        taskExecutionContext.setTaskType(taskInstance.getTaskType());
 -        taskExecutionContext.setExecutePath(getExecLocalPath(taskInstance));
 -        taskExecutionContext.setTaskJson(taskInstance.getTaskJson());
 -        taskExecutionContext.setProcessInstanceId(taskInstance.getProcessInstance().getId());
 -        taskExecutionContext.setScheduleTime(taskInstance.getProcessInstance().getScheduleTime());
 -        taskExecutionContext.setGlobalParams(taskInstance.getProcessInstance().getGlobalParams());
 -        taskExecutionContext.setExecutorId(taskInstance.getProcessInstance().getExecutorId());
 -        taskExecutionContext.setCmdTypeIfComplement(taskInstance.getProcessInstance().getCmdTypeIfComplement().getCode());
 -        taskExecutionContext.setTenantCode(taskInstance.getProcessInstance().getTenantCode());
 -        taskExecutionContext.setQueue(taskInstance.getProcessInstance().getQueue());
 -        taskExecutionContext.setProcessDefineId(taskInstance.getProcessDefine().getId());
 -        taskExecutionContext.setProjectId(taskInstance.getProcessDefine().getProjectId());
 -
 -        return taskExecutionContext;
 -    }
 -
--
      /**
       * get execute local path
       *