Switch cleanup delay to using long instead of int everywhere, to avoi…

…d overflow issues for long delays in milliseconds (#1498)
UNC-Libraries · Dec 7, 2022 · b2d80f5 · b2d80f5
1 parent 847fb7d
commit b2d80f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/deposit-app/src/main/java/edu/unc/lib/boxc/deposit/CleanupDepositJob.java b/deposit-app/src/main/java/edu/unc/lib/boxc/deposit/CleanupDepositJob.java
@@ -37,6 +37,7 @@ public class CleanupDepositJob extends AbstractDepositJob {
 
     private IngestSourceManager sourceManager;
 
+    // Redis expects to receive ints for its delays
     private int statusKeysExpireSeconds;
 
     public CleanupDepositJob() {

diff --git a/deposit-app/src/main/java/edu/unc/lib/boxc/deposit/work/DepositSupervisor.java b/deposit-app/src/main/java/edu/unc/lib/boxc/deposit/work/DepositSupervisor.java
@@ -144,28 +144,28 @@ private Client makeJesqueClient() {
 
     private long actionMonitorDelay = 1000l;
 
-    private int cleanupDelaySeconds;
+    private long cleanupDelaySeconds;
 
-    private int unavailableDelaySeconds;
+    private long unavailableDelaySeconds;
 
     private boolean isQuieted;
 
     // Visible for testing
     protected ActionMonitoringTask actionMonitoringTask;
 
-    public int getCleanupDelaySeconds() {
+    public long getCleanupDelaySeconds() {
         return cleanupDelaySeconds;
     }
 
-    public void setCleanupDelaySeconds(int cleanupDelaySeconds) {
+    public void setCleanupDelaySeconds(long cleanupDelaySeconds) {
         this.cleanupDelaySeconds = cleanupDelaySeconds;
     }
 
-    public int getUnavailableDelaySeconds() {
+    public long getUnavailableDelaySeconds() {
         return unavailableDelaySeconds;
     }
 
-    public void setUnavailableDelaySeconds(int unavailableDelaySeconds) {
+    public void setUnavailableDelaySeconds(long unavailableDelaySeconds) {
         this.unavailableDelaySeconds = unavailableDelaySeconds;
     }
 
@@ -882,7 +882,7 @@ private void queueNextJob(Job job, String depositUUID, Map<String, String> statu
             Job cleanJob = makeJob(CleanupDepositJob.class, depositUUID);
             LOG.info("Queuing {} for deposit {}",
                     cleanJob.getClassName(), depositUUID);
-            enqueueJob(cleanJob, status, 1000 * this.getCleanupDelaySeconds());
+            enqueueJob(cleanJob, status, 1000l * this.getCleanupDelaySeconds());
         }
     }