Stop processing tasks by schedulers on remove of the Polling Interval…

… from the configuration immediately Fix #1390
dcm4che · May 13, 2018 · 6e4239b · 6e4239b
1 parent f5d7ae7
commit 6e4239b
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 5 deletions.
diff --git a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditScheduler.java b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditScheduler.java
@@ -122,8 +122,12 @@ protected void execute() {
             } catch (IOException e) {
                 LOG.warn("Failed to access Audit Spool Directory - {}", dir, e);
             }
-            for (Path path : pathList)
+            for (Path path : pathList) {
+                if (getPollingInterval() == null)
+                    return;
+
                 service.auditAndProcessFile(logger, path);
+            }
         }
     }
 }
diff --git a/...-arc-delete/src/main/java/org/dcm4chee/arc/delete/impl/DeleteExpiredStudiesScheduler.java b/...-arc-delete/src/main/java/org/dcm4chee/arc/delete/impl/DeleteExpiredStudiesScheduler.java
@@ -173,6 +173,9 @@ private void rejectExpiredSeries(
                     .setMaxResults(seriesFetchSize)
                     .getResultList();
             for (Series series : seriesList) {
+                if (getPollingInterval() == null)
+                    return;
+
                 try {
                     reject(ae, series.getStudy().getStudyInstanceUID(), series.getSeriesInstanceUID(), rn, rejectionNoteObjectStorageID);
                 } catch (IOException e) {
@@ -191,6 +194,9 @@ private void rejectExpiredStudies(
                     .setMaxResults(studyFetchSize)
                     .getResultList();
             for (Study study : studies) {
+                if (getPollingInterval() == null)
+                    return;
+
                 try {
                     reject(ae, study.getStudyInstanceUID(), null, rn, rejectionNoteObjectStorageID);
                 } catch (IOException e) {

diff --git a/...c-delete/src/main/java/org/dcm4chee/arc/delete/impl/DeleteRejectedInstancesScheduler.java b/...c-delete/src/main/java/org/dcm4chee/arc/delete/impl/DeleteRejectedInstancesScheduler.java
@@ -102,6 +102,8 @@ private void delete(String queryName, Code rjCode, Duration delay, int fetchSize
         Date before = new Date(System.currentTimeMillis() - delay.getSeconds() * 1000);
         int deleted;
         do {
+            if (getPollingInterval() == null)
+                return;
             deleted = ejb.deleteRejectedInstancesOrRejectionNotesBefore(queryName, rjCode, before, fetchSize);
         } while (deleted == fetchSize);
     }

diff --git a/...-arc-delete/src/main/java/org/dcm4chee/arc/delete/impl/PurgeInstanceRecordsScheduler.java b/...-arc-delete/src/main/java/org/dcm4chee/arc/delete/impl/PurgeInstanceRecordsScheduler.java
@@ -111,8 +111,14 @@ protected void execute() {
         Map<String, Storage> storageMap = new HashMap<>();
         try {
             do {
+                if (getPollingInterval() == null)
+                    return;
+
                 series = ejb.findSeriesToPurgeInstances(fetchSize);
                 for (Series.MetadataUpdate metadataUpdate : series) {
+                    if (getPollingInterval() == null)
+                        return;
+
                     Long seriesPk = metadataUpdate.seriesPk;
                     if (!claim(seriesPk))
                         continue;

diff --git a/dcm4chee-arc-delete/src/main/java/org/dcm4chee/arc/delete/impl/PurgeStorageScheduler.java b/dcm4chee-arc-delete/src/main/java/org/dcm4chee/arc/delete/impl/PurgeStorageScheduler.java
@@ -136,6 +136,8 @@ protected void execute() {
                         BinaryPrefix.formatDecimal(minUsableSpace), BinaryPrefix.formatDecimal(deleteSize));
             }
             for (int i = 0; i == 0 || deleteSize > 0L; i++) {
+                if (getPollingInterval() == null)
+                    return;
                 if (deleteSize > 0L) {
                     if (deleteStudies(desc, deleteStudyBatchSize, deletePatient) == 0)
                         deleteSize = 0L;
@@ -274,6 +276,8 @@ private static boolean matchStorageID(Attributes attrs, String storageID) {
     private int deleteStudiesFromDB(StorageDescriptor desc, List<Long> studyPks, boolean deletePatient) {
         int removed = 0;
         for (Long studyPk : studyPks) {
+            if (getPollingInterval() == null)
+                break;
             StudyDeleteContextImpl ctx = new StudyDeleteContextImpl(studyPk);
             ctx.setDeletePatientOnDeleteLastStudy(deletePatient);
             try {
@@ -297,6 +301,8 @@ private int deleteStudiesFromDB(StorageDescriptor desc, List<Long> studyPks, boo
     private int deleteObjectsOfStudies(StorageDescriptor desc, List<Long> studyPks) {
         int removed = 0;
         for (Long studyPk : studyPks) {
+            if (getPollingInterval() == null)
+                break;
             try {
                 Study study = ejb.deleteObjectsOfStudy(studyPk, desc.getStorageID());
                 removed++;
@@ -315,6 +321,8 @@ private boolean deleteSeriesMetadata(StorageDescriptor desc, int fetchSize) {
 
         try (Storage storage = storageFactory.getStorage(desc)) {
             for (Metadata m : metadata) {
+                if (getPollingInterval() == null)
+                    return false;
                 try {
                     storage.deleteObject(m.getStoragePath());
                     ejb.removeMetadata(m);
@@ -337,6 +345,8 @@ private boolean deleteNextObjectsFromStorage(StorageDescriptor desc, int fetchSi
 
         try (Storage storage = storageFactory.getStorage(desc)) {
             for (Location location : locations) {
+                if (getPollingInterval() == null)
+                    return false;
                 try {
                     storage.deleteObject(location.getStoragePath());
                     ejb.removeLocation(location);

diff --git a/dcm4chee-arc-export-mgt/src/main/java/org/dcm4chee/arc/export/mgt/impl/ExportScheduler.java b/dcm4chee-arc-export-mgt/src/main/java/org/dcm4chee/arc/export/mgt/impl/ExportScheduler.java
@@ -45,7 +45,7 @@ protected Duration getPollingInterval() {
     protected void execute() {
         ArchiveDeviceExtension arcDev = device.getDeviceExtension(ArchiveDeviceExtension.class);
         int fetchSize = arcDev.getExportTaskFetchSize();
-        while (ejb.scheduleExportTasks(fetchSize) == fetchSize)
+        while (getPollingInterval() != null && ejb.scheduleExportTasks(fetchSize) == fetchSize)
             ;
     }
 }
diff --git a/dcm4chee-arc-hl7-psu/src/main/java/org/dcm4chee/arc/hl7/psu/HL7PSUScheduler.java b/dcm4chee-arc-hl7-psu/src/main/java/org/dcm4chee/arc/hl7/psu/HL7PSUScheduler.java
@@ -103,7 +103,10 @@ protected void execute() {
         List<HL7PSUTask> hl7psuTasks;
         do {
             hl7psuTasks = ejb.fetchHL7PSUTasksForMPPS(device.getDeviceName(), hl7psuTaskPk, fetchSize);
-            for (HL7PSUTask hl7psuTask : hl7psuTasks)
+            for (HL7PSUTask hl7psuTask : hl7psuTasks) {
+                if (getPollingInterval() == null)
+                    return;
+
                 try {
                     hl7psuTaskPk = hl7psuTask.getPk();
                     ApplicationEntity ae = device.getApplicationEntity(hl7psuTask.getAETitle());
@@ -115,10 +118,14 @@ protected void execute() {
                 } catch (Exception e) {
                     LOG.warn("Failed to process {}:\n", hl7psuTask, e);
                 }
+            }
         } while (hl7psuTasks.size() == fetchSize);
         do {
             hl7psuTasks = ejb.fetchHL7PSUTasksForStudy(device.getDeviceName(), fetchSize);
             for (HL7PSUTask hl7psuTask : hl7psuTasks) {
+                if (getPollingInterval() == null)
+                    return;
+
                 ApplicationEntity ae = device.getApplicationEntity(hl7psuTask.getAETitle());
                 ArchiveAEExtension arcAE = ae.getAEExtension(ArchiveAEExtension.class);
                 HL7PSU action = hl7PSUActionOnStudy(arcAE);

diff --git a/dcm4chee-arc-ian-scu/src/main/java/org/dcm4chee/arc/ian/scu/IANScheduler.java b/dcm4chee-arc-ian-scu/src/main/java/org/dcm4chee/arc/ian/scu/IANScheduler.java
@@ -103,7 +103,10 @@ protected void execute() {
         Attributes ian;
         do {
             ianTasks = ejb.fetchIANTasksForMPPS(device.getDeviceName(), ianTaskPk, fetchSize);
-            for (IanTask ianTask : ianTasks)
+            for (IanTask ianTask : ianTasks) {
+                if (getPollingInterval() == null)
+                    return;
+
                 try {
                     ianTaskPk = ianTask.getPk();
                     ApplicationEntity ae = device.getApplicationEntity(ianTask.getCallingAET(), true);
@@ -116,10 +119,14 @@ protected void execute() {
                 } catch (Exception e) {
                     LOG.warn("Failed to process {}", ianTask, e);
                 }
+            }
         } while (ianTasks.size() == fetchSize);
         do {
             ianTasks = ejb.fetchIANTasksForStudy(device.getDeviceName(), fetchSize);
-            for (IanTask ianTask : ianTasks)
+            for (IanTask ianTask : ianTasks) {
+                if (getPollingInterval() == null)
+                    return;
+
                 try {
                     ApplicationEntity ae = device.getApplicationEntity(ianTask.getCallingAET(), true);
                     if (ianTask.getMpps() == null) {
@@ -146,6 +153,7 @@ protected void execute() {
                 } catch (Exception e) {
                     LOG.warn("Failed to process {}", ianTask, e);
                 }
+            }
         } while (ianTasks.size() == fetchSize);
     }
 

diff --git a/dcm4chee-arc-metadata/src/main/java/org/dcm4chee/arc/metadata/UpdateMetadataScheduler.java b/dcm4chee-arc-metadata/src/main/java/org/dcm4chee/arc/metadata/UpdateMetadataScheduler.java
@@ -132,6 +132,9 @@ protected void execute() {
             if (!metadataUpdates.isEmpty())
                 try (Storage storage = storageFactory.getUsableStorage(descriptors)) {
                     for (Series.MetadataUpdate metadataUpdate : metadataUpdates) {
+                        if (getPollingInterval() == null)
+                            return;
+
                         try (RetrieveContext ctx = retrieveService.newRetrieveContextSeriesMetadata(metadataUpdate)) {
                             updateMetadata(ctx, storage);
                         } catch (Exception e) {