You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/10/10 11:00:04 UTC
hbase git commit: HBASE-14581 Znode cleanup throws auth exception in
secure mode
Repository: hbase
Updated Branches:
refs/heads/master f13591291 -> 1b66ea71b
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/1b66ea71
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1b66ea71
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1b66ea71
Branch: refs/heads/master
Commit: 1b66ea71b69e8b24ba7ecb9ba6548d775777f417
Parents: f135912
Author: tedyu <yu...@gmail.com>
Authored: Sat Oct 10 01:59:57 2015 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Sat Oct 10 01:59:57 2015 -0700
----------------------------------------------------------------------
bin/hbase-daemon.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1b66ea71/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