This is an automated email from the ASF dual-hosted git repository.
paksyd pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 2921b1fd10a HBASE-29758 Running the thrift and thrift2 help commands
via the shell will throw an ExitCodeException (#7532) (#7696)
2921b1fd10a is described below
commit 2921b1fd10a1f899811ce4ffc266c8c25c65b53b
Author: Liu Xiao <[email protected]>
AuthorDate: Mon Feb 2 18:15:33 2026 +0800
HBASE-29758 Running the thrift and thrift2 help commands via the shell will
throw an ExitCodeException (#7532) (#7696)
Signed-off-by: Dávid Paksy <[email protected]>
---
.../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 7f2d3744029..2a0cc639bcb 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
