You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/10/10 19:52:11 UTC
[2/2] hbase git commit: HBASE-14581 Znode cleanup throws auth
exception in secure mode
HBASE-14581 Znode cleanup throws auth exception in secure mode
Conflicts:
bin/hbase-daemon.sh
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7c0a4073
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7c0a4073
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7c0a4073
Branch: refs/heads/branch-1.0
Commit: 7c0a4073969fb79ab3c5b324645ddb0515835dcf
Parents: c640d93
Author: tedyu <yu...@gmail.com>
Authored: Sat Oct 10 07:31:08 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Sat Oct 10 10:51:53 2015 -0700
----------------------------------------------------------------------
bin/hbase-daemon.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7c0a4073/bin/hbase-daemon.sh
----------------------------------------------------------------------
diff --git a/bin/hbase-daemon.sh b/bin/hbase-daemon.sh
index 4ad657f..0ded607 100755
--- a/bin/hbase-daemon.sh
+++ b/bin/hbase-daemon.sh
@@ -75,11 +75,11 @@ hbase_rotate_log ()
cleanZNode() {
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