hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject [1/2] hbase git commit: HBASE-14581 Znode cleanup throws auth exception in secure mode
Date Sat, 10 Oct 2015 17:52:10 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 f4ef48f64 -> aaf7e2246
  refs/heads/branch-1.0 c640d9366 -> 7c0a40739


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/aaf7e224
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/aaf7e224
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/aaf7e224

Branch: refs/heads/0.98
Commit: aaf7e22461eb1a2720f746cb86f9fc1afc570198
Parents: f4ef48f
Author: tedyu <yuzhihong@gmail.com>
Authored: Sat Oct 10 07:31:08 2015 -0700
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Sat Oct 10 10:50:29 2015 -0700

----------------------------------------------------------------------
 bin/hbase-daemon.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/aaf7e224/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


Mime
View raw message