You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2021/07/28 05:07:31 UTC
[hbase] branch branch-2.4 updated: HBASE-26146: Add support for
HBASE_HBCK_OPTS (#3537)
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new f8ba9b3 HBASE-26146: Add support for HBASE_HBCK_OPTS (#3537)
f8ba9b3 is described below
commit f8ba9b3fe15fccef498d64f35e1d616ef27b6567
Author: Bryan Beaudreault <bb...@hubspot.com>
AuthorDate: Wed Jul 28 01:06:51 2021 -0400
HBASE-26146: Add support for HBASE_HBCK_OPTS (#3537)
Signed-off-by: stack <st...@apache.org>
---
bin/hbase | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/bin/hbase b/bin/hbase
index 59c4871..6bf03f7 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -54,6 +54,8 @@
# HBASE_SHELL_OPTS Extra options passed to the hbase shell.
# Empty by default.
#
+# HBASE_HBCK_OPTS Extra options passed to hbck.
+# Defaults to HBASE_SERVER_JAAS_OPTS if specified, or HBASE_REGIONSERVER_OPTS.
bin=`dirname "$0"`
bin=`cd "$bin">/dev/null; pwd`
@@ -423,12 +425,18 @@ else
HBASE_OPTS="$HBASE_OPTS $CLIENT_GC_OPTS"
fi
-if [ "$AUTH_AS_SERVER" == "true" ] || [ "$COMMAND" = "hbck" ]; then
- if [ -n "$HBASE_SERVER_JAAS_OPTS" ]; then
- HBASE_OPTS="$HBASE_OPTS $HBASE_SERVER_JAAS_OPTS"
- else
- HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS"
- fi
+if [ -n "$HBASE_SERVER_JAAS_OPTS" ]; then
+ AUTH_AS_SERVER_OPTS="$HBASE_SERVER_JAAS_OPTS"
+else
+ AUTH_AS_SERVER_OPTS="$HBASE_REGIONSERVER_OPTS"
+fi
+
+if [ "$AUTH_AS_SERVER" == "true" ]; then
+ HBASE_OPTS="$HBASE_OPTS $AUTH_AS_SERVER_OPTS"
+elif [ -z "$HBASE_HBCK_OPTS" ]; then
+ # The default for hbck should be to use auth-as-server args, for compatibility
+ # with HBASE-15145
+ HBASE_HBCK_OPTS="$AUTH_AS_SERVER_OPTS"
fi
# check if the command needs jline
@@ -545,6 +553,7 @@ elif [ "$COMMAND" = "hbck" ] ; then
CLASS='org.apache.hadoop.hbase.util.HBaseFsck'
;;
esac
+ HBASE_OPTS="$HBASE_OPTS $HBASE_HBCK_OPTS"
elif [ "$COMMAND" = "wal" ] ; then
CLASS='org.apache.hadoop.hbase.wal.WALPrettyPrinter'
elif [ "$COMMAND" = "hfile" ] ; then