Repository: hbase Updated Branches: refs/heads/branch-1 419d15f83 -> d4a842948
HBASE-14581 Znode cleanup throws auth exception in secure mode Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d4a84294 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d4a84294 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d4a84294 Branch: refs/heads/branch-1 Commit: d4a842948a0c92ab5518d38a21b03d36359d4a4f Parents: 419d15f Author: tedyu <yuzhih...@gmail.com> Authored: Sat Oct 10 01:59:57 2015 -0700 Committer: Mikhail Antonov <anto...@apache.org> Committed: Fri Jun 17 10:57:08 2016 -0700 ---------------------------------------------------------------------- bin/hbase-daemon.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/d4a84294/bin/hbase-daemon.sh ---------------------------------------------------------------------- diff --git a/bin/hbase-daemon.sh b/bin/hbase-daemon.sh index 6f0a524..3d1c4b0 100755 --- a/bin/hbase-daemon.sh +++ b/bin/hbase-daemon.sh @@ -81,11 +81,11 @@ cleanAfterRun() { if [ -f ${HBASE_ZNODE_FILE} ]; then if [ "$command" = "master" ]; then - $bin/hbase master clear > /dev/null 2>&1 + HBASE_OPTS="$HBASE_OPTS $HBASE_MASTER_OPTS" $bin/hbase master clear > /dev/null 2>&1 else #call ZK to delete the node ZNODE=`cat ${HBASE_ZNODE_FILE}` - $bin/hbase zkcli delete ${ZNODE} > /dev/null 2>&1 + HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS" $bin/hbase zkcli delete ${ZNODE} > /dev/null 2>&1 fi rm ${HBASE_ZNODE_FILE} fi
