commit 332d9d13b1da0c20f3d5bdc0c2aeefd3669572fe
author Bryan Beaudreault <bbeaudreault@hubspot.com> Tue Jul 27 16:10:42 2021 -0400
committer stack <stack@apache.org> Tue Jul 27 13:13:08 2021 -0700
tree 7e0dc12a6444668f613bc0a8e0d615236f7a8bb6
parent 02d263e7dde146956fda0ec245aeae85926ab12f

HBASE-26146: Add support for HBASE_HBCK_OPTS (#3534)

Signed-off-by: stack <stack@apache.org>

bin/hbase

diff --git a/bin/hbase b/bin/hbase
index c6612e3..0206bbd 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -57,6 +57,8 @@
 #   HBASE_JSHELL_ARGS Additional arguments passed to the jshell.
 #                     Defaults to `--startup DEFAULT --startup PRINTING --startup hbase_startup.jsh`
 #
+#   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`
 
@@ -432,12 +434,18 @@
 	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
@@ -569,6 +577,7 @@
     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