Repository: hbase Updated Branches: refs/heads/branch-1.2 11d0121a4 -> 734def4fd
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/734def4f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/734def4f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/734def4f Branch: refs/heads/branch-1.2 Commit: 734def4fd672008525d747559edc92b63a222bb4 Parents: 11d0121 Author: tedyu <[email protected]> Authored: Sat Oct 10 07:30:26 2015 -0700 Committer: tedyu <[email protected]> Committed: Sat Oct 10 07:30:26 2015 -0700 ---------------------------------------------------------------------- bin/hbase-daemon.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/734def4f/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
