Merge pull request #444 from bcgov/feature/GRAD2-2396

GRAD2-2396: task is complete.
bcgov · Nov 14, 2023 · c44a6b0 · c44a6b0
2 parents ca76182 + eb2d217
commit c44a6b0
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/BatchJobConfig.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/BatchJobConfig.java
@@ -33,7 +33,7 @@
 import java.util.UUID;
 
 @Configuration
-@EnableBatchProcessing
+@EnableBatchProcessing(isolationLevelForCreate = "ISOLATION_READ_COMMITTED")
 public class BatchJobConfig {
 
     // Partitioning for Regular Grad Run updates

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/BatchJobLauncher.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/BatchJobLauncher.java
@@ -2,6 +2,7 @@
 
 import ca.bc.gov.educ.api.batchgraduation.entity.BatchProcessingEntity;
 import ca.bc.gov.educ.api.batchgraduation.service.GradDashboardService;
+import net.javacrumbs.shedlock.core.LockAssert;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,6 +47,7 @@ public class BatchJobLauncher {
     private Job userScheduledBatchJobRefresher;
 
     @Autowired
+    @Qualifier("asyncJobLauncher")
     private JobLauncher jobLauncher;
 
     @Autowired
@@ -66,9 +68,10 @@ public class BatchJobLauncher {
     private static final String ERROR_MSG = "Error {}";
 
     @Scheduled(cron = "${batch.regalg.cron}")
-    @SchedulerLock(name = "GraduationBatchJob", lockAtLeastFor = "20s", lockAtMostFor = "1200m")
+    @SchedulerLock(name = "GraduationBatchJob", lockAtLeastFor = "${batch.system.scheduled.routines.lockAtLeastFor}", lockAtMostFor = "${batch.system.scheduled.routines.lockAtMostFor}")
     public void runRegularGradAlgorithm() {
         LOGGER.info(BATCH_STARTED);
+        LockAssert.assertLocked();
         JobParametersBuilder builder = new JobParametersBuilder();
         builder.addLong(TIME, System.currentTimeMillis()).toJobParameters();
         builder.addString(JOB_TRIGGER, BATCH_TRIGGER);
@@ -86,9 +89,10 @@ public void runRegularGradAlgorithm() {
     }
 
     @Scheduled(cron = "${batch.tvrrun.cron}")
-    @SchedulerLock(name = "tvrBatchJob", lockAtLeastFor = "20s", lockAtMostFor = "1200m")
+    @SchedulerLock(name = "tvrBatchJob", lockAtLeastFor = "${batch.system.scheduled.routines.lockAtLeastFor}", lockAtMostFor = "${batch.system.scheduled.routines.lockAtMostFor}")
     public void runTranscriptVerificationReportProcess() {
         LOGGER.info(BATCH_STARTED);
+        LockAssert.assertLocked();
         JobParametersBuilder builder = new JobParametersBuilder();
         builder.addLong(TIME, System.currentTimeMillis()).toJobParameters();
         builder.addString(JOB_TRIGGER, BATCH_TRIGGER);
@@ -106,9 +110,10 @@ public void runTranscriptVerificationReportProcess() {
     }
 
     @Scheduled(cron = "${batch.distrun.cron}")
-    @SchedulerLock(name = "DistributionBatchJob", lockAtLeastFor = "10s", lockAtMostFor = "120m")
+    @SchedulerLock(name = "DistributionBatchJob", lockAtLeastFor = "PT10S", lockAtMostFor = "PT120M")
     public void runMonthlyDistributionProcess() {
         LOGGER.info(BATCH_STARTED);
+        LockAssert.assertLocked();
         JobParametersBuilder builder = new JobParametersBuilder();
         builder.addLong(TIME, System.currentTimeMillis()).toJobParameters();
         builder.addString(JOB_TRIGGER, BATCH_TRIGGER);
@@ -126,9 +131,10 @@ public void runMonthlyDistributionProcess() {
     }
 
     @Scheduled(fixedDelayString = "PT30M")
-    @SchedulerLock(name = "userScheduledBatchJobRefresher", lockAtLeastFor = "10s", lockAtMostFor = "5m")
+    @SchedulerLock(name = "userScheduledBatchJobRefresher", lockAtLeastFor = "PT10S", lockAtMostFor = "PT5M")
     public void refreshUserScheduledQueue() {
         LOGGER.info(BATCH_STARTED);
+        LockAssert.assertLocked();
         JobParametersBuilder builder = new JobParametersBuilder();
         builder.addLong(TIME, System.currentTimeMillis()).toJobParameters();
         try {

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/TaskSchedulerConfig.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/TaskSchedulerConfig.java
@@ -36,6 +36,7 @@ public LockableTaskScheduler getScheduler() {
 
         LockManager lockManager = new DefaultLockManager(lockProvider, lockConfigurationExtractor);
         ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+        scheduler.setPoolSize(30);
         scheduler.setThreadNamePrefix("UserScheduledTask-");
         scheduler.initialize();
         return new LockableTaskScheduler(scheduler, lockManager);

diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml
@@ -153,6 +153,11 @@ batch:
       jobs:
         lockAtLeastFor: ${CRON_USER_SCHEDULED_JOBS_LOCK_AT_LEAST_FOR}
         lockAtMostFor: ${CRON_USER_SCHEDULED_JOBS_LOCK_AT_MOST_FOR}
+  system:
+    scheduled:
+      routines:
+        lockAtLeastFor: ${CRON_SYSTEM_SCHEDULED_ROUTINES_LOCK_AT_LEAST_FOR}
+        lockAtMostFor: ${CRON_SYSTEM_SCHEDULED_ROUTINES_LOCK_AT_MOST_FOR}
 
 #Endpoints
 endpoint:

diff --git a/api/src/test/resources/application.yaml b/api/src/test/resources/application.yaml
@@ -82,6 +82,11 @@ batch:
       jobs:
         lockAtLeastFor: 10
         lockAtMostFor: 180
+  system:
+    scheduled:
+      routines:
+        lockAtLeastFor: PT1M
+        lockAtMostFor: PT600M
 
 #Endpoints
 endpoint: