You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by zi...@apache.org on 2023/06/07 09:37:59 UTC
[pulsar] 02/05: [fix][cli] Fix logging noise while admin tool exit (#19884)
This is an automated email from the ASF dual-hosted git repository.
zike pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit adc931a422cbd76e17664f3e7529784f3e07a72e
Author: Rajan Dhabalia <rd...@apache.org>
AuthorDate: Tue Jun 6 03:58:40 2023 -0700
[fix][cli] Fix logging noise while admin tool exit (#19884)
Co-authored-by: tison <wa...@gmail.com>
(cherry picked from commit ad352a90f13173324feac816ee97ffff5140cf8f)
---
.../src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java | 2 +-
.../src/main/java/org/apache/pulsar/common/util/ShutdownUtil.java | 5 ++++-
2 files changed, 5 insertions(+), 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
index ca0a8a055cf..68445042239 100644
--- 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
@@ -312,7 +312,7 @@ public class PulsarAdminTool {
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
index b461cfab0d1..ff124847071 100644
--- 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"));
}