Merge branch 'master' into circular-dependencies-fix

box · Jul 31, 2023 · 996472b · 996472b
2 parents e1098f1 + 98b6029
commit 996472b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/webapp/src/main/java/com/box/l10n/mojito/quartz/QuartzJobInfo.java b/webapp/src/main/java/com/box/l10n/mojito/quartz/QuartzJobInfo.java
@@ -1,6 +1,7 @@
 package com.box.l10n.mojito.quartz;
 
 import java.util.Date;
+import org.quartz.JobBuilder;
 
 public class QuartzJobInfo<I, O> {
   Class<? extends QuartzPollableJob<I, O>> clazz;
@@ -12,6 +13,7 @@ public class QuartzJobInfo<I, O> {
   String uniqueId;
   boolean inlineInput;
   long timeout;
+  boolean requestRecovery;
 
   private QuartzJobInfo(Builder<I, O> builder) {
     clazz = builder.clazz;
@@ -23,6 +25,7 @@ private QuartzJobInfo(Builder<I, O> builder) {
     uniqueId = builder.uniqueId;
     inlineInput = builder.inlineInput;
     timeout = builder.timeout;
+    requestRecovery = builder.requestRecovery;
   }
 
   public Class<? extends QuartzPollableJob<I, O>> getClazz() {
@@ -61,6 +64,10 @@ public long getTimeout() {
     return timeout;
   }
 
+  public boolean getRequestRecovery() {
+    return requestRecovery;
+  }
+
   public static <I, O> Builder<I, O> newBuilder(Class<? extends QuartzPollableJob<I, O>> clazz) {
     Builder<I, O> builder = new Builder<I, O>();
     builder.clazz = clazz;
@@ -77,6 +84,7 @@ public static final class Builder<I, O> {
     private String uniqueId;
     private boolean inlineInput = true;
     private long timeout = 3600;
+    private boolean requestRecovery = false;
 
     private Builder() {}
 
@@ -120,6 +128,12 @@ public Builder<I, O> withTimeout(long val) {
       return this;
     }
 
+    /** As defined in {@link JobBuilder#requestRecovery(boolean)} */
+    public Builder<I, O> withRequestRecovery(boolean requestRecovery) {
+      this.requestRecovery = requestRecovery;
+      return this;
+    }
+
     public QuartzJobInfo<I, O> build() {
       return new QuartzJobInfo<I, O>(this);
     }

diff --git a/webapp/src/main/java/com/box/l10n/mojito/quartz/QuartzPollableTaskScheduler.java b/webapp/src/main/java/com/box/l10n/mojito/quartz/QuartzPollableTaskScheduler.java
@@ -104,7 +104,11 @@ public <I, O> PollableFuture<O> scheduleJob(QuartzJobInfo<I, O> quartzJobInfo) {
       if (jobDetail == null) {
         logger.debug("Job doesn't exist, create for key: {}", keyName);
         jobDetail =
-            JobBuilder.newJob().ofType(quartzJobInfo.getClazz()).withIdentity(jobKey).build();
+            JobBuilder.newJob()
+                .ofType(quartzJobInfo.getClazz())
+                .withIdentity(jobKey)
+                .requestRecovery(quartzJobInfo.getRequestRecovery())
+                .build();
       }
 
       logger.debug("Schedule a job for key: {}", keyName);