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/26 14:11:06 UTC
[incubator-dolphinscheduler] 02/02: Merge branch 'refactor-worker'
into refactor-worker
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 f2a7fea7ad56b28cfddb37d3718ba5d64d88c79e
Merge: 2bb5eba 04b1e02
Author: Tboy <te...@yeah.net>
AuthorDate: Wed Feb 26 22:10:55 2020 +0800
Merge branch 'refactor-worker' into refactor-worker
.../dolphinscheduler/server/worker/processor/TaskKillProcessor.java | 1 -
.../apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java | 1 -
2 files changed, 2 deletions(-)
diff --cc dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java
index 1f5aa3c,2985374..ce54eff
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java
@@@ -56,12 -50,7 +56,11 @@@ public class TaskKillProcessor implemen
doKill(killCommand);
}
--
+ /**
+ * kill task logic
+ *
+ * @param killCommand killCommand
+ */
private void doKill(KillTaskRequestCommand killCommand){
try {
if(killCommand.getProcessId() == 0 ){
diff --cc dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java
index c0dd25b,be89401..46e838a
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java
@@@ -144,7 -142,7 +144,6 @@@ public class TaskExecuteThread implemen
// task result process
task.after();
-
- //
responseCommand.setStatus(task.getExitStatus().getCode());
responseCommand.setEndTime(new Date());
logger.info("task instance id : {},task final status : {}", taskExecutionContext.getTaskInstanceId(), task.getExitStatus());