* executor: tweak shutdown handling, print all tasks not complete

Signed-off-by: neo <1100909+neowu@users.noreply.github.com>
neowu · Feb 7, 2024 · 45f5a86 · 45f5a86
1 parent ec1f94d
commit 45f5a86
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/core-ng/src/main/java/core/framework/internal/async/ExecutorImpl.java b/core-ng/src/main/java/core/framework/internal/async/ExecutorImpl.java
@@ -4,6 +4,7 @@
 import core.framework.async.Task;
 import core.framework.internal.log.ActionLog;
 import core.framework.internal.log.LogManager;
+import core.framework.util.Sets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,7 +13,6 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
@@ -31,7 +31,7 @@ public final class ExecutorImpl implements Executor {
     private final LogManager logManager;
     private final long maxProcessTimeInNano;
     private final ReentrantLock lock = new ReentrantLock();
-    private final Set<String> runningTasks = ConcurrentHashMap.newKeySet();     // track running tasks, used to print tasks failed to complete on shutdown
+    private final Set<String> runningTasks = Sets.newConcurrentHashSet();     // track running tasks, used to print tasks failed to complete on shutdown
 
     volatile ScheduledExecutorService scheduler;
 
@@ -61,10 +61,11 @@ public void awaitTermination(long timeoutInMs) throws InterruptedException {
         boolean success = executor.awaitTermination(timeoutInMs, TimeUnit.MILLISECONDS);
         if (!success) {
             executor.shutdownNow();
-            logger.warn(errorCode("FAILED_TO_STOP"), "failed to terminate executor, canceledTasks={}", runningTasks);
-        } else {
-            logger.info("executor stopped");
+            if (!runningTasks.isEmpty()) {
+                logger.error(errorCode("FAILED_TO_STOP"), "failed to terminate executor, canceledTasks={}", runningTasks);
+            }
         }
+        logger.info("executor stopped");
     }
 
     @Override

diff --git a/core-ng/src/main/java/core/framework/internal/log/LoggerImpl.java b/core-ng/src/main/java/core/framework/internal/log/LoggerImpl.java
@@ -19,7 +19,7 @@ static String abbreviateLoggerName(String name) {
         for (int i = 0; i < tokens.length; i++) {
             String token = tokens[i];
             if (i > 0) builder.append('.');
-            if (i < abbrCount && token.length() >= 1) {
+            if (i < abbrCount && !token.isEmpty()) {
                 builder.append(token.charAt(0));
             } else {
                 builder.append(token);