From 5f335a6fe3f3699fc3df52f1b90d233b49c19af6 Mon Sep 17 00:00:00 2001 From: liuxiaocs7 Date: Tue, 9 Dec 2025 21:42:24 +0800 Subject: [PATCH] HBASE-29758 Running the thrift and thrift2 help commands via the shell will throw an ExitCodeException --- .../java/org/apache/hadoop/hbase/thrift/ThriftServer.java | 4 ++-- .../java/org/apache/hadoop/hbase/thrift2/ThriftServer.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java index a0370aab0fb1..1a5b92163955 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java @@ -353,7 +353,7 @@ protected void printUsageAndExit(Options options, int exitCode) throws ExitCodeE + "To shutdown the thrift server run 'hbase-daemon.sh stop " + "thrift' or send a kill signal to the thrift server pid", true); - throw new ExitCodeException(exitCode, ""); + System.exit(exitCode); } /** @@ -778,7 +778,7 @@ protected void processOptions(final String[] args) throws Exception { CommandLine cmd = parser.parse(options, args); if (cmd.hasOption("help")) { - printUsageAndExit(options, 1); + printUsageAndExit(options, 0); } parseCommandLine(cmd, options); } diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftServer.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftServer.java index 3d403c56daee..0361626ffc7f 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftServer.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftServer.java @@ -64,7 +64,7 @@ protected void printUsageAndExit(Options options, int exitCode) throws Shell.Exi + "To shutdown the thrift server run 'hbase-daemon.sh stop thrift2' or" + " send a kill signal to the thrift server pid", true); - throw new Shell.ExitCodeException(exitCode, ""); + System.exit(exitCode); } @Override