use cronJobMaster for clustered environment

OpenConext · Dec 7, 2023 · 02cdc29 · 02cdc29
1 parent 906b9ec
commit 02cdc29
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/manage-server/src/main/java/manage/service/jobs/MetadataAutoRefreshRunner.java b/manage-server/src/main/java/manage/service/jobs/MetadataAutoRefreshRunner.java
@@ -1,5 +1,5 @@
 package manage.service.jobs;
-
+import org.springframework.beans.factory.annotation.Value;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import manage.conf.Features;
 import manage.conf.MetaDataAutoConfiguration;
@@ -59,21 +59,25 @@ public class MetadataAutoRefreshRunner implements Runnable {
 
     private final FeatureService featureService;
 
+    private final boolean cronJobResponsible;
+
     public MetadataAutoRefreshRunner(MetaDataService metaDataService,
                                      ImporterService importerService,
                                      MetaDataAutoConfiguration metaDataAutoConfiguration,
-                                     FeatureService featureService) {
+                                     FeatureService featureService,
+                                     @Value("${cron.node-cron-job-responsible}") boolean cronJobResponsible) {
 
         this.metaDataService = metaDataService;
         this.importerService = importerService;
         this.metaDataAutoConfiguration = metaDataAutoConfiguration;
         this.featureService = featureService;
+        this.cronJobResponsible = cronJobResponsible;
     }
 
     @Override
     @Scheduled(cron = "${metadata_import.auto_refresh.cronSchedule}")
     public void run() {
-        if (featureService.isFeatureEnabled(Features.AUTO_REFRESH)) {
+        if (this.cronJobResponsible && featureService.isFeatureEnabled(Features.AUTO_REFRESH)) {
             // Check whether a Thread is already running
             if (running || !execLock.tryLock()) {
                 LOG.warn(LOG_ALREADY_RUNNING);

diff --git a/manage-server/src/main/resources/application.yml b/manage-server/src/main/resources/application.yml
@@ -105,6 +105,9 @@ metadata_import:
   auto_refresh:
     cronSchedule: "-"
 
+cron:
+  node-cron-job-responsible: True
+
 # used by the git plugin
 info:
   build:

diff --git a/manage-server/src/test/java/manage/service/jobs/MetaDataAutoRefreshRunner.java b/manage-server/src/test/java/manage/service/jobs/MetaDataAutoRefreshRunner.java
@@ -46,7 +46,6 @@ class MetadataAutoRefreshRunnerTest {
     @Mock
     MetaDataAutoConfiguration metaDataAutoConfiguration;
 
-    @InjectMocks
     MetadataAutoRefreshRunner autoRefreshRunner;
 
     @Captor
@@ -90,6 +89,8 @@ void setUp() {
         Logger logger = (Logger) LoggerFactory.getLogger(MetadataAutoRefreshRunner.class);
         memoryAppender = LogUtils.configureLogger(logger);
         memoryAppender.start();
+
+        autoRefreshRunner = new MetadataAutoRefreshRunner(metaDataService, importerService, metaDataAutoConfiguration, featureService, true);
     }
 
     @Test