Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 38BFE18A5A for ; Sat, 10 Oct 2015 09:00:05 +0000 (UTC) Received: (qmail 63775 invoked by uid 500); 10 Oct 2015 09:00:05 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 63733 invoked by uid 500); 10 Oct 2015 09:00:04 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 63724 invoked by uid 99); 10 Oct 2015 09:00:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Oct 2015 09:00:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5E240E03E4; Sat, 10 Oct 2015 09:00:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tedyu@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-14581 Znode cleanup throws auth exception in secure mode Date: Sat, 10 Oct 2015 09:00:04 +0000 (UTC) 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 Authored: Sat Oct 10 01:59:57 2015 -0700 Committer: tedyu 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