|
@@ -17,10 +17,7 @@
|
|
|
|
|
|
package org.apache.dolphinscheduler.server.worker.runner;
|
|
|
|
|
|
-import static java.util.Calendar.DAY_OF_MONTH;
|
|
|
-
|
|
|
import org.apache.dolphinscheduler.common.Constants;
|
|
|
-import org.apache.dolphinscheduler.common.enums.CommandType;
|
|
|
import org.apache.dolphinscheduler.common.enums.Event;
|
|
|
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
|
|
import org.apache.dolphinscheduler.common.enums.TaskType;
|
|
@@ -36,7 +33,7 @@ import org.apache.dolphinscheduler.remote.command.Command;
|
|
|
import org.apache.dolphinscheduler.remote.command.TaskExecuteAckCommand;
|
|
|
import org.apache.dolphinscheduler.remote.command.TaskExecuteResponseCommand;
|
|
|
import org.apache.dolphinscheduler.server.utils.ProcessUtils;
|
|
|
-import org.apache.dolphinscheduler.server.worker.cache.ResponceCache;
|
|
|
+import org.apache.dolphinscheduler.server.worker.cache.ResponseCache;
|
|
|
import org.apache.dolphinscheduler.server.worker.plugin.TaskPluginManager;
|
|
|
import org.apache.dolphinscheduler.server.worker.processor.TaskCallbackService;
|
|
|
import org.apache.dolphinscheduler.service.alert.AlertClientService;
|
|
@@ -44,7 +41,6 @@ import org.apache.dolphinscheduler.service.queue.entity.TaskExecutionContext;
|
|
|
import org.apache.dolphinscheduler.spi.task.AbstractTask;
|
|
|
import org.apache.dolphinscheduler.spi.task.TaskAlertInfo;
|
|
|
import org.apache.dolphinscheduler.spi.task.TaskChannel;
|
|
|
-import org.apache.dolphinscheduler.spi.task.TaskConstants;
|
|
|
import org.apache.dolphinscheduler.spi.task.TaskExecutionContextCacheManager;
|
|
|
import org.apache.dolphinscheduler.spi.task.request.TaskRequest;
|
|
|
|
|
@@ -131,7 +127,7 @@ public class TaskExecuteThread implements Runnable, Delayed {
|
|
|
responseCommand.setStatus(ExecutionStatus.SUCCESS.getCode());
|
|
|
responseCommand.setEndTime(new Date());
|
|
|
TaskExecutionContextCacheManager.removeByTaskInstanceId(taskExecutionContext.getTaskInstanceId());
|
|
|
- ResponceCache.get().cache(taskExecutionContext.getTaskInstanceId(), responseCommand.convert2Command(), Event.RESULT);
|
|
|
+ ResponseCache.get().cache(taskExecutionContext.getTaskInstanceId(), responseCommand.convert2Command(), Event.RESULT);
|
|
|
taskCallbackService.sendResult(taskExecutionContext.getTaskInstanceId(), responseCommand.convert2Command());
|
|
|
return;
|
|
|
}
|
|
@@ -213,7 +209,7 @@ public class TaskExecuteThread implements Runnable, Delayed {
|
|
|
responseCommand.setAppIds(task.getAppIds());
|
|
|
} finally {
|
|
|
TaskExecutionContextCacheManager.removeByTaskInstanceId(taskExecutionContext.getTaskInstanceId());
|
|
|
- ResponceCache.get().cache(taskExecutionContext.getTaskInstanceId(), responseCommand.convert2Command(), Event.RESULT);
|
|
|
+ ResponseCache.get().cache(taskExecutionContext.getTaskInstanceId(), responseCommand.convert2Command(), Event.RESULT);
|
|
|
taskCallbackService.sendResult(taskExecutionContext.getTaskInstanceId(), responseCommand.convert2Command());
|
|
|
clearTaskExecPath();
|
|
|
}
|