[fix][cli] Fix logging noise while admin tool exit (apache#19884)

Co-authored-by: tison <wander4096@gmail.com>
nodece · Jun 6, 2023 · ad352a9 · ad352a9
1 parent fff5e39
commit ad352a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java
@@ -306,7 +306,7 @@ private static void exit(int code) {
         if (allowSystemExit) {
             // we are using halt and not System.exit, we do not mind about shutdown hooks
             // they are only slowing down the tool
-            ShutdownUtil.triggerImmediateForcefulShutdown(code);
+            ShutdownUtil.triggerImmediateForcefulShutdown(code, false);
         } else {
             System.out.println("Exit code is " + code + " (System.exit not called, as we are in test mode)");
         }

diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/ShutdownUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/ShutdownUtil.java
@@ -47,8 +47,11 @@ public class ShutdownUtil {
      * @see Runtime#halt(int)
      */
     public static void triggerImmediateForcefulShutdown(int status) {
+        triggerImmediateForcefulShutdown(status, true);
+    }
+    public static void triggerImmediateForcefulShutdown(int status, boolean logging) {
         try {
-            if (status != 0) {
+            if (status != 0 && logging) {
                 log.warn("Triggering immediate shutdown of current process with status {}", status,
                         new Exception("Stacktrace for immediate shutdown"));
             }