|
|
|
@@ -124,6 +124,7 @@ public class EMSSchedulerImpl implements EMSScheduler {
|
|
|
|
|
public void reloadJob(String jobName) throws SchedulerException, ClassNotFoundException {
|
|
|
|
|
JobInfo jobInfo = jobInfoService.getById(jobName);
|
|
|
|
|
if (CLUSTERED.equals(jobInfo.getInstanceName())) {
|
|
|
|
|
deleteJob(scheduler, jobName);
|
|
|
|
|
reloadClusteredJob(jobInfo);
|
|
|
|
|
} else {
|
|
|
|
|
deleteAndAddJob(scheduler, jobInfo);
|
|
|
|
@@ -132,26 +133,44 @@ public class EMSSchedulerImpl implements EMSScheduler {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void reloadClusteredJob(JobInfo jobInfo) throws SchedulerException, ClassNotFoundException {
|
|
|
|
|
TriggerKey triggerKey = new TriggerKey(getTriggerName(jobInfo.getId()), Scheduler.DEFAULT_GROUP);
|
|
|
|
|
String jobId = jobInfo.getId();
|
|
|
|
|
TriggerKey triggerKey = new TriggerKey(getTriggerName(jobId), Scheduler.DEFAULT_GROUP);
|
|
|
|
|
JobKey jobKey = new JobKey(jobId, Scheduler.DEFAULT_GROUP);
|
|
|
|
|
|
|
|
|
|
Trigger existing = clusteredScheduler.getTrigger(triggerKey);
|
|
|
|
|
if (existing != null) {
|
|
|
|
|
JobDetail existingJob = clusteredScheduler.getJobDetail(jobKey);
|
|
|
|
|
log.info("[reloadClusteredJob] {} - existingTrigger={}, existingJob={}", jobId,
|
|
|
|
|
existing != null ? existing.getKey() : "null",
|
|
|
|
|
existingJob != null ? existingJob.getKey() : "null");
|
|
|
|
|
|
|
|
|
|
if (existing != null && existingJob != null) {
|
|
|
|
|
CronTrigger newTrigger = newTrigger()
|
|
|
|
|
.withIdentity(triggerKey)
|
|
|
|
|
.withSchedule(cronSchedule(jobInfo.getCronExp()))
|
|
|
|
|
.build();
|
|
|
|
|
Date ft = clusteredScheduler.rescheduleJob(triggerKey, newTrigger);
|
|
|
|
|
log.info("{} rescheduled at: {} cron: {}", jobInfo.getId(), ft, jobInfo.getCronExp());
|
|
|
|
|
} else {
|
|
|
|
|
deleteAndAddJob(clusteredScheduler, jobInfo);
|
|
|
|
|
if (ft != null) {
|
|
|
|
|
log.info("[reloadClusteredJob] {} rescheduled at: {} cron: {}", jobId, ft, jobInfo.getCronExp());
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
log.warn("[reloadClusteredJob] {} rescheduleJob returned null, falling back to deleteAndAddJob", jobId);
|
|
|
|
|
} else if (existing != null) {
|
|
|
|
|
// orphaned trigger (job missing) — clean up before re-adding
|
|
|
|
|
log.warn("[reloadClusteredJob] {} has orphaned trigger without job, unscheduling", jobId);
|
|
|
|
|
clusteredScheduler.unscheduleJob(triggerKey);
|
|
|
|
|
}
|
|
|
|
|
log.info("[reloadClusteredJob] {} calling deleteAndAddJob on clusteredScheduler", jobId);
|
|
|
|
|
deleteAndAddJob(clusteredScheduler, jobInfo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void deleteJob(Scheduler inScheduler, String jobNm) throws SchedulerException {
|
|
|
|
|
String schedulerType = (inScheduler == clusteredScheduler) ? "clusteredScheduler" : "scheduler";
|
|
|
|
|
JobKey key = new JobKey(jobNm, Scheduler.DEFAULT_GROUP);
|
|
|
|
|
JobDetail jobDetail = inScheduler.getJobDetail(key);
|
|
|
|
|
log.info("[deleteJob] {} from {} — found={}", jobNm, schedulerType, jobDetail != null);
|
|
|
|
|
if (jobDetail != null) {
|
|
|
|
|
inScheduler.deleteJob(key);
|
|
|
|
|
log.info(jobNm + " has been scheduled to deleted");
|
|
|
|
|
log.info("[deleteJob] {} deleted from {}", jobNm, schedulerType);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -160,8 +179,12 @@ public class EMSSchedulerImpl implements EMSScheduler {
|
|
|
|
|
if (StringUtils.equalsIgnoreCase(info.getUseYn(), "Y")
|
|
|
|
|
&& StringUtils.equalsAnyIgnoreCase(info.getInstanceName(), "ALL", "CLUSTERED", ContainerUtil.getInstanceName())) {
|
|
|
|
|
|
|
|
|
|
String schedulerType = (inScheduler == clusteredScheduler) ? "clusteredScheduler" : "scheduler";
|
|
|
|
|
log.info("[addJob] {} → {}, class={}, cron={}", info.getId(), schedulerType, info.getJobClassName(), info.getCronExp());
|
|
|
|
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
|
|
Class<Job> jobClass = (Class<Job>) Class.forName(info.getJobClassName());
|
|
|
|
|
log.info("[addJob] {} class loaded: {}", info.getId(), jobClass.getName());
|
|
|
|
|
|
|
|
|
|
JobBuilder jobBuilder = newJob(jobClass);
|
|
|
|
|
jobBuilder = jobBuilder.withIdentity(info.getId(), Scheduler.DEFAULT_GROUP);
|
|
|
|
@@ -177,11 +200,13 @@ public class EMSSchedulerImpl implements EMSScheduler {
|
|
|
|
|
.withSchedule(cronSchedule(info.getCronExp()))
|
|
|
|
|
.build();
|
|
|
|
|
|
|
|
|
|
log.info("[addJob] {} calling scheduleJob...", info.getId());
|
|
|
|
|
Date ft = inScheduler.scheduleJob(job, trigger);
|
|
|
|
|
log
|
|
|
|
|
.info("{} has been scheduled to run at: {} and repeat based on expression: {}", job.getKey(), ft,
|
|
|
|
|
trigger.getCronExpression());
|
|
|
|
|
}
|
|
|
|
|
log.info("[addJob] {} scheduled at: {} cron: {}", job.getKey(), ft, trigger.getCronExpression());
|
|
|
|
|
} else {
|
|
|
|
|
log.info("[addJob] {} skipped — useYn={}, instanceName={}, currentInstance={}",
|
|
|
|
|
info.getId(), info.getUseYn(), info.getInstanceName(), ContainerUtil.getInstanceName());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|