From dd7b1b1d0c0e7d4e88bc2eb9112af2faeef687a9 Mon Sep 17 00:00:00 2001 From: Tboy Date: Sun, 13 Oct 2019 12:06:59 +0800 Subject: [PATCH] move updateTaskState into try/catch block in case of exception (#1003) * move updateTaskState into try/catch block in case of exception * fix NPE --- .../dolphinscheduler/api/service/SchedulerService.java | 1 + .../apache/dolphinscheduler/common/utils/PropertyUtils.java | 2 +- .../server/worker/runner/TaskScheduleThread.java | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java index 7e2a93fcbc..8ad0e0721d 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java @@ -450,6 +450,7 @@ public class SchedulerService extends BaseService { Schedule schedule = processDao.querySchedule(scheduleId); if (schedule == null) { logger.warn("process schedule info not exists"); + return; } Date startDate = schedule.getStartTime(); diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/PropertyUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/PropertyUtils.java index c775ce77bc..0b9ef0d4de 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/PropertyUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/PropertyUtils.java @@ -129,7 +129,7 @@ public class PropertyUtils { return Boolean.parseBoolean(value); } - return null; + return false; } /** diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java index 91da0b6d1c..dee422b5b1 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java @@ -82,10 +82,10 @@ public class TaskScheduleThread implements Runnable { @Override public void run() { - // update task state is running according to task type - updateTaskState(taskInstance.getTaskType()); - try { + // update task state is running according to task type + updateTaskState(taskInstance.getTaskType()); + logger.info("script path : {}", taskInstance.getExecutePath()); // task node TaskNode taskNode = JSONObject.parseObject(taskInstance.getTaskJson(), TaskNode.class);