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

Shutdown server threads on server close #11496

Merged
merged 2 commits into from
Mar 16, 2022
+13 −5
Merged

Shutdown server threads on server close #11496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a5fad8
Shutdown server threads on server close
findepi Mar 15, 2022
ab6c0cd
Use daemon threads for internal thread pools
findepi Mar 15, 2022
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
5 changes: 3 additions & 2 deletions core/trino-main/src/main/java/io/trino/execution/ClusterSizeMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
import static io.airlift.concurrent.Threads.threadsNamed;
import static io.airlift.concurrent.Threads.daemonThreadsNamed;
import static io.trino.spi.StandardErrorCode.GENERIC_INSUFFICIENT_RESOURCES;
import static java.lang.String.format;
import static java.util.Comparator.comparing;
Expand Down Expand Up @@ -73,7 +73,7 @@ public ClusterSizeMonitor(
{
this.nodeManager = requireNonNull(nodeManager, "nodeManager is null");
this.includeCoordinator = includeCoordinator;
this.executor = newSingleThreadScheduledExecutor(threadsNamed("node-monitor-%s"));
this.executor = newSingleThreadScheduledExecutor(daemonThreadsNamed("node-monitor-%s"));
}

@PostConstruct
Expand All @@ -87,6 +87,7 @@ public void start()
public void stop()
{
nodeManager.removeNodeChangeListener(listener);
executor.shutdown();
}

/**
Expand Down
13 changes: 10 additions & 3 deletions core/trino-main/src/main/java/io/trino/metadata/DiscoveryNodeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static com.google.common.collect.Sets.difference;
import static io.airlift.concurrent.Threads.threadsNamed;
import static io.airlift.concurrent.Threads.daemonThreadsNamed;
import static io.airlift.http.client.HttpUriBuilder.uriBuilderFrom;
import static io.trino.metadata.NodeState.ACTIVE;
import static io.trino.metadata.NodeState.INACTIVE;
Expand Down Expand Up @@ -106,8 +106,8 @@ public DiscoveryNodeManager(
this.failureDetector = requireNonNull(failureDetector, "failureDetector is null");
this.expectedNodeVersion = requireNonNull(expectedNodeVersion, "expectedNodeVersion is null");
this.httpClient = requireNonNull(httpClient, "httpClient is null");
this.nodeStateUpdateExecutor = newSingleThreadScheduledExecutor(threadsNamed("node-state-poller-%s"));
this.nodeStateEventExecutor = newCachedThreadPool(threadsNamed("node-state-events-%s"));
this.nodeStateUpdateExecutor = newSingleThreadScheduledExecutor(daemonThreadsNamed("node-state-poller-%s"));
this.nodeStateEventExecutor = newCachedThreadPool(daemonThreadsNamed("node-state-events-%s"));
this.httpsRequired = internalCommunicationConfig.isHttpsRequired();

this.currentNode = findCurrentNode(
Expand Down Expand Up @@ -154,6 +154,13 @@ public void startPollingNodeStates()
pollWorkers();
}

@PreDestroy
public void destroy()
{
nodeStateUpdateExecutor.shutdown();
nodeStateEventExecutor.shutdown();
}

private void pollWorkers()
{
AllNodes allNodes = getAllNodes();
Expand Down