Skip to content

Reverting custom thread pool from #53 in watch mode #81

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

Merged
car-roll merged 4 commits into from
Nov 23, 2021
Merged

Reverting custom thread pool from #53 in watch mode #81

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
103ba99
Revert "Use a dedicated thread pool rather than Timer.get for Durable…
jglick Oct 19, 2018
1b6a34a
Merge branch 'master' into standard-thread-pool
jglick Apr 12, 2019
d2def1b
Merge branch 'master' into standard-thread-pool
jglick Jun 4, 2019
bd90be9
Merge branch 'master' of https://github.com/jenkinsci/workflow-durabl…
jglick Nov 3, 2021
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
6 changes: 5 additions & 1 deletion src/main/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -210,7 +211,10 @@ interface ExecutionRemotable {
public static long REMOTE_TIMEOUT = Integer.parseInt(System.getProperty(DurableTaskStep.class.getName() + ".REMOTE_TIMEOUT", "20"));

private static ScheduledThreadPoolExecutor threadPool;
private static synchronized ScheduledThreadPoolExecutor threadPool() {
private static synchronized ScheduledExecutorService threadPool() {
if (USE_WATCHING) {
Copy link
Member Author

@jglick jglick Nov 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this feature flag remains off by default.

return Timer.get();
}
if (threadPool == null) {
threadPool = new ScheduledThreadPoolExecutor(25, new NamingThreadFactory(new DaemonThreadFactory(), DurableTaskStep.class.getName()));
threadPool.setKeepAliveTime(1, TimeUnit.MINUTES);
Expand Down