diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java index aa7808a04c3..71bba5998ef 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java @@ -405,6 +405,7 @@ public void shutdown() throws Exception { if (processorFuture != null) { processorFuture.cancel(true); } + processorExecutorService.shutdown(); requestJobs = null; cancelledTargets = null; requestStore.clearCache(); 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 index 3635b42f18a..a1b5749835f 100644 --- 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 @@ -262,7 +262,7 @@ - + Core of the service which manages the request and target job lifecycle. diff --git a/modules/dcache-qos/src/main/resources/org/dcache/qos/qos-adjuster.xml b/modules/dcache-qos/src/main/resources/org/dcache/qos/qos-adjuster.xml index beab8b448d4..b63015df6e8 100644 --- a/modules/dcache-qos/src/main/resources/org/dcache/qos/qos-adjuster.xml +++ b/modules/dcache-qos/src/main/resources/org/dcache/qos/qos-adjuster.xml @@ -67,7 +67,7 @@ Preserves the QOS session id generated for the task. - +