Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bulk/qos: shutdown executor services when stopped #7688

Merged
merged 1 commit into from
Nov 6, 2024
+3 −2
Merged

bulk/qos: shutdown executor services when stopped #7688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .../dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@ public void shutdown() throws Exception {
if (processorFuture != null) {
processorFuture.cancel(true);
}
processorExecutorService.shutdown();
requestJobs = null;
cancelledTargets = null;
requestStore.clearCache();
Expand Down
2 changes: 1 addition & 1 deletion modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/bulk.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
<property name="requestStore" ref="request-store"/>
</bean>

<bean id="request-manager" class="org.dcache.services.bulk.manager.ConcurrentRequestManager">
<bean id="request-manager" class="org.dcache.services.bulk.manager.ConcurrentRequestManager" destroy-method="shutdown">
<description>Core of the service which manages the request and target job lifecycle.</description>
<property name="statistics" ref="statistics"/>
<property name="targetStore" ref="target-store"/>
Expand Down
2 changes: 1 addition & 1 deletion modules/dcache-qos/src/main/resources/org/dcache/qos/qos-adjuster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<bean id="adjuster-executor" class="org.dcache.util.CDCExecutorServiceDecorator">
<description>Preserves the QOS session id generated for the task.</description>
<constructor-arg>
<bean class="org.dcache.util.BoundedCachedExecutor">
<bean class="org.dcache.util.BoundedCachedExecutor" destroy-method="shutdown">
<constructor-arg value="${qos.limits.adjuster.submit-threads}"/>
</bean>
</constructor-arg>
Expand Down