From fa97aab8be10df62cc13bb799604e15bc94b6a61 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 2 Aug 2018 14:30:02 +0200 Subject: [PATCH] SchedulerAccessor catches cluster race conditions on job rescheduling Issue: SPR-17114 --- .../scheduling/quartz/SchedulerAccessor.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java index 0ea93100e30..cf30b419681 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java @@ -310,7 +310,15 @@ public abstract class SchedulerAccessor implements ResourceLoaderAware { !this.jobDetails.contains(jobDetail) && addJobToScheduler(jobDetail)) { this.jobDetails.add(jobDetail); } - getScheduler().rescheduleJob(trigger.getKey(), trigger); + try { + getScheduler().rescheduleJob(trigger.getKey(), trigger); + } + catch (ObjectAlreadyExistsException ex) { + if (logger.isDebugEnabled()) { + logger.debug("Unexpectedly encountered existing trigger on rescheduling, assumably due to " + + "cluster race condition: " + ex.getMessage() + " - can safely be ignored"); + } + } } else { try { @@ -325,8 +333,8 @@ public abstract class SchedulerAccessor implements ResourceLoaderAware { } catch (ObjectAlreadyExistsException ex) { if (logger.isDebugEnabled()) { - logger.debug("Unexpectedly found existing trigger, assumably due to cluster race condition: " + - ex.getMessage() + " - can safely be ignored"); + logger.debug("Unexpectedly encountered existing trigger on job scheduling, assumably due to " + + "cluster race condition: " + ex.getMessage() + " - can safely be ignored"); } if (this.overwriteExistingJobs) { getScheduler().rescheduleJob(trigger.getKey(), trigger);