(hbase) branch branch-3 updated: HBASE-29758 Running the thrift and thrift2 help commands via the shell will throw an ExitCodeException (#7532)

[paksyd]

This is an automated email from the ASF dual-hosted git repository.

paksyd pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-3 by this push:
     new 5d226a523a0 HBASE-29758 Running the thrift and thrift2 help commands 
via the shell will throw an ExitCodeException (#7532)
5d226a523a0 is described below

commit 5d226a523a08fd83edd1e6c457cd07a44e95eade
Author: Liu Xiao <42756849+liuxiao...@users.noreply.github.com>
AuthorDate: Thu Jan 29 16:56:59 2026 +0800

    HBASE-29758 Running the thrift and thrift2 help commands via the shell will 
throw an ExitCodeException (#7532)
    
    Signed-off-by: Dávid Paksy <pak...@apache.org>
    (cherry picked from commit 0fb1f3b54ccb30a8fb406ff0047f2bc72432fc19)
---
 .../src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java    | 4 ++--
 .../src/main/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 a0370aab0fb..1a5b9216395 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 @@ public class ThriftServer extends Configured implements 
Tool {
         + "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 @@ public class ThriftServer extends Configured implements 
Tool {
     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 3d403c56dae..0361626ffc7 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 @@ public class ThriftServer extends 
org.apache.hadoop.hbase.thrift.ThriftServer {
         + "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