This is an automated email from the ASF dual-hosted git repository.
caishunfeng pushed a commit to branch 3.0.1-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/3.0.1-prepare by this push:
new 81f2d6b293 [3.0.1-prepare]cherry-pick[Bug-#11650][worker] #11650 fix
SQL type task, stop task does not take effect (#11938)
81f2d6b293 is described below
commit 81f2d6b2938149daa832a51039184f0441c1497b
Author: 冯剑 <[email protected]>
AuthorDate: Thu Sep 15 09:03:47 2022 +0800
[3.0.1-prepare]cherry-pick[Bug-#11650][worker] #11650 fix SQL type task,
stop task does not take effect (#11938)
* [Bug-11650][worker] #11650 fix SQL type task, stop task does not take
effect
Co-authored-by: 冯剑 Jian <[email protected]>
---
.../dolphinscheduler/server/worker/processor/TaskKillProcessor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java
b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java
index e5633f9aa2..eece06ce09 100644
---
a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java
+++
b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java
@@ -124,7 +124,9 @@ public class TaskKillProcessor implements
NettyRequestProcessor {
private void sendTaskKillResponseCommand(Channel channel,
TaskExecutionContext taskExecutionContext) {
TaskKillResponseCommand taskKillResponseCommand = new
TaskKillResponseCommand();
taskKillResponseCommand.setStatus(taskExecutionContext.getCurrentExecutionStatus().getCode());
-
taskKillResponseCommand.setAppIds(Arrays.asList(taskExecutionContext.getAppIds().split(TaskConstants.COMMA)));
+ if (taskExecutionContext.getAppIds() != null) {
+
taskKillResponseCommand.setAppIds(Arrays.asList(taskExecutionContext.getAppIds().split(TaskConstants.COMMA)));
+ }
taskKillResponseCommand.setTaskInstanceId(taskExecutionContext.getTaskInstanceId());
taskKillResponseCommand.setHost(taskExecutionContext.getHost());
taskKillResponseCommand.setProcessId(taskExecutionContext.getProcessId());