Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-15145 HBCK and Replication should authenticate to zookepeer using server principal

This commit is contained in:
Enis Soztutar 2016-01-26 14:43:24 -08:00
parent 70fb2e5aab
commit 6d56ecfcf7
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/hbase
View File

@ -77,6 +77,7 @@ if [ $# = 0 ]; then
echo "Options:" echo "Options:"
echo " --config DIR Configuration direction to use. Default: ./conf" echo " --config DIR Configuration direction to use. Default: ./conf"
echo " --hosts HOSTS Override the list in 'regionservers' file" echo " --hosts HOSTS Override the list in 'regionservers' file"
echo " --auth-as-server Authenticate to ZooKeeper using servers configuration"
echo "" echo ""
echo "Commands:" echo "Commands:"
echo "Some commands take arguments. Pass no args or -h for usage." echo "Some commands take arguments. Pass no args or -h for usage."
@ -281,6 +282,14 @@ else
HBASE_OPTS="$HBASE_OPTS $CLIENT_GC_OPTS" HBASE_OPTS="$HBASE_OPTS $CLIENT_GC_OPTS"
fi 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
fi
# figure out which class to run # figure out which class to run
if [ "$COMMAND" = "shell" ] ; then if [ "$COMMAND" = "shell" ] ; then
# eg export JRUBY_HOME=/usr/local/share/jruby # eg export JRUBY_HOME=/usr/local/share/jruby

5
bin/hbase-config.sh
View File

@ -61,6 +61,11 @@ do
hosts=$1 hosts=$1
shift shift
HBASE_REGIONSERVERS=$hosts HBASE_REGIONSERVERS=$hosts
elif [ "--auth-as-server" = "$1" ]
then
shift
# shellcheck disable=SC2034
AUTH_AS_SERVER="true"
else else
# Presume we are at end of options and break # Presume we are at end of options and break
break break