Not enough to p.shutdown, one has to p.awaitTermination

enso-org · Apr 28, 2023 · f71557d · f71557d
1 parent ae3050e
commit f71557d
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/ThreadExecutors.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/ThreadExecutors.java
@@ -5,7 +5,9 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
 
 final class ThreadExecutors {
   private final EnsoContext context;
@@ -32,6 +34,17 @@ public void shutdown() {
     while (it.hasNext()) {
       var p = it.next().getKey();
       p.shutdown();
+      boolean success;
+      try {
+        success = p.awaitTermination(10, TimeUnit.SECONDS);
+      } catch (InterruptedException ex) {
+        success = false;
+      }
+      if (!success) {
+        context
+            .getLogger()
+            .log(Level.WARNING, "Cannot shutdown {0} thread pool", it.next().getValue());
+      }
     }
   }