HBASE-15145 HBCK and Replication should authenticate to zookepeer using server principal
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6d56ecfc Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6d56ecfc Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6d56ecfc Branch: refs/heads/branch-1 Commit: 6d56ecfcf7d7aa3a525076108c061455b5b5bb05 Parents: 70fb2e5 Author: Enis Soztutar <e...@apache.org> Authored: Tue Jan 26 14:43:24 2016 -0800 Committer: Enis Soztutar <e...@apache.org> Committed: Tue Jan 26 14:43:30 2016 -0800 ---------------------------------------------------------------------- bin/hbase | 9 +++++++++ bin/hbase-config.sh | 5 +++++ 2 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6d56ecfc/bin/hbase ---------------------------------------------------------------------- diff --git a/bin/hbase b/bin/hbase index f4722ac..7901033 100755 --- a/bin/hbase +++ b/bin/hbase @@ -77,6 +77,7 @@ if [ $# = 0 ]; then echo "Options:" echo " --config DIR Configuration direction to use. Default: ./conf" echo " --hosts HOSTS Override the list in 'regionservers' file" + echo " --auth-as-server Authenticate to ZooKeeper using servers configuration" echo "" echo "Commands:" echo "Some commands take arguments. Pass no args or -h for usage." @@ -281,6 +282,14 @@ 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 +fi + # figure out which class to run if [ "$COMMAND" = "shell" ] ; then # eg export JRUBY_HOME=/usr/local/share/jruby http://git-wip-us.apache.org/repos/asf/hbase/blob/6d56ecfc/bin/hbase-config.sh ---------------------------------------------------------------------- diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh index c113adb..d7d7e6f 100644 --- a/bin/hbase-config.sh +++ b/bin/hbase-config.sh @@ -61,6 +61,11 @@ do hosts=$1 shift HBASE_REGIONSERVERS=$hosts + elif [ "--auth-as-server" = "$1" ] + then + shift + # shellcheck disable=SC2034 + AUTH_AS_SERVER="true" else # Presume we are at end of options and break break
