Shutdown server threads on server close

This fix threads leak in tests.
trinodb · Mar 16, 2022 · b1710ed · b1710ed
1 parent 5b5b8c6
commit b1710ed
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/execution/ClusterSizeMonitor.java b/core/trino-main/src/main/java/io/trino/execution/ClusterSizeMonitor.java
@@ -87,6 +87,7 @@ public void start()
     public void stop()
     {
         nodeManager.removeNodeChangeListener(listener);
+        executor.shutdown();
     }
 
     /**

diff --git a/core/trino-main/src/main/java/io/trino/metadata/DiscoveryNodeManager.java b/core/trino-main/src/main/java/io/trino/metadata/DiscoveryNodeManager.java
@@ -154,6 +154,13 @@ public void startPollingNodeStates()
         pollWorkers();
     }
 
+    @PreDestroy
+    public void destroy()
+    {
+        nodeStateUpdateExecutor.shutdown();
+        nodeStateEventExecutor.shutdown();
+    }
+
     private void pollWorkers()
     {
         AllNodes allNodes = getAllNodes();
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,6 +87,7 @@ public void start() @@
         public void stop()
         {
             nodeManager.removeNodeChangeListener(listener);
+            executor.shutdown();
         }
         /**
@@ Expand Down @@