to #9801: fix delete job of quartz not work

apache · Jun 28, 2022 · 6246bd6 · 6246bd6
1 parent 7d91ad3
commit 6246bd6
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/...-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SchedulerServiceImpl.java b/...-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SchedulerServiceImpl.java
@@ -459,17 +459,11 @@ public void deleteSchedule(int projectId, int scheduleId) {
 
         String jobName = QuartzExecutors.buildJobName(scheduleId);
         String jobGroupName = QuartzExecutors.buildJobGroupName(projectId);
-
-        JobKey jobKey = new JobKey(jobName, jobGroupName);
-        try {
-            if (scheduler.checkExists(jobKey)) {
-                logger.info("Try to delete job: {}, group name: {},", jobName, jobGroupName);
-                scheduler.deleteJob(jobKey);
-            }
-        } catch (SchedulerException e) {
-            logger.error("Failed to delete job: {}", jobKey);
-            throw new ServiceException("Failed to delete job: " + jobKey);
+        boolean result = QuartzExecutors.getInstance().deleteJob(jobName, jobGroupName);
+        if (!result) {
+            throw new ServiceException(String.format("Failed to delete job, jobName:%s, jobGroupName:%s", jobName, jobGroupName));
         }
+        logger.info("delete job success, job name: {}, job group name: {},", jobName, jobGroupName);
     }
 
     /**