Repository: hbase Updated Branches: refs/heads/branch-1.1 e107e9ce0 -> f4898bb98
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/f4898bb9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f4898bb9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f4898bb9 Branch: refs/heads/branch-1.1 Commit: f4898bb98f3937926b0af8c2682b2797944f0522 Parents: e107e9c Author: tedyu <[email protected]> Authored: Sat Oct 10 07:31:08 2015 -0700 Committer: tedyu <[email protected]> Committed: Sat Oct 10 07:31:08 2015 -0700 ---------------------------------------------------------------------- bin/hbase-daemon.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f4898bb9/bin/hbase-daemon.sh ---------------------------------------------------------------------- diff --git a/bin/hbase-daemon.sh b/bin/hbase-daemon.sh index 213e2dd..f29d470 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
