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

FISH-9222 bugfix: disable PayaraExecutorService events before server shuts down #6880

Merged
merged 1 commit into from
Aug 24, 2024
Merged

FISH-9222 bugfix: disable PayaraExecutorService events before server shuts down #6880

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
19 changes: 12 additions & 7 deletions ...utor-service/src/main/java/fish/payara/nucleus/executorservice/PayaraExecutorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright (c) [2017-2022] Payara Foundation and/or its affiliates. All rights reserved.
* Copyright (c) [2017-2024] Payara Foundation and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
Expand Down Expand Up @@ -137,8 +137,10 @@ public void event(Event event) {
if (null == threadPoolExecutor) {
initialiseThreadPools();
}
} else if (event.is(EventTypes.SERVER_SHUTDOWN)) {
} else if (event.is(EventTypes.PREPARE_SHUTDOWN)) {
terminateThreadPools();
} else if (event.is(EventTypes.SERVER_SHUTDOWN)) {
awaitTerminationOfThreadPools();
}
}

Expand All @@ -149,7 +151,13 @@ private void terminateThreadPools() {
}
threadPoolExecutor.shutdown();
scheduledThreadPoolExecutor.shutdown();
}

private void awaitTerminationOfThreadPools() {
if (threadPoolExecutor == null) {
// we didn't initialize yet
return;
}
// Wait until the schedulers actually terminate
try {
threadPoolExecutor.awaitTermination(5, TimeUnit.SECONDS);
Expand Down Expand Up @@ -189,9 +197,6 @@ private void initialiseThreadPools() {
Logger.getLogger(PayaraExecutorService.class.getName()).log(SEVERE, "Uncaught exception in Payara Scheduled Executor thread ", thrwbl));
return t;
});
scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);


} else {
int threadPoolExecutorQueueSize = Integer.valueOf(payaraExecutorServiceConfiguration.getThreadPoolExecutorQueueSize());

Expand Down Expand Up @@ -224,9 +229,9 @@ public void uncaughtException(Thread thread, Throwable thrwbl) {
});
return t;
});
scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
}

scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
scheduledThreadPoolExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
}

public <T> Future<T> submit(Callable<T> task) {
Expand Down