Add some more shutdown options

paulmillar · Sep 6, 2024 · 1956e47 · 1956e47
1 parent d74fd8a
commit 1956e47
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/BulkServiceCommands.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/BulkServiceCommands.java
@@ -1434,6 +1434,10 @@ public PagedTargetResult call() throws Exception {
 
     private JdbcBulkArchiveDao archiveDao;
 
+    public void shutdown() {
+        executor.shutdown();
+    }
+
     @Required
     public void setActivityFactory(BulkActivityFactory activityFactory) {
         this.activityFactory = activityFactory;

diff --git a/.../dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java b/.../dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java
@@ -408,6 +408,7 @@ public void shutdown() throws Exception {
         requestJobs = null;
         cancelledTargets = null;
         requestStore.clearCache();
+        processorExecutorService.shutdown();
     }
 
     @Override

diff --git a/modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/bulk.xml b/modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/bulk.xml
@@ -295,7 +295,7 @@
     <property name="endpointStub" ref="ha-leader-stub"/>
   </bean>
 
-  <bean id="admin-commands" class="org.dcache.services.bulk.BulkServiceCommands">
+  <bean id="admin-commands" class="org.dcache.services.bulk.BulkServiceCommands" destroy-method="shutdown">
     <description>Holds the various commands for administrative purposes.</description>
     <property name="service" ref="bulk-service"/>
     <property name="activityFactory" ref="activity-factory"/>