You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ra...@apache.org on 2014/07/14 07:33:21 UTC
git commit: HBASE-11493 Autorestart option is not working because of
stale znode 'shutdown'(Nijel)
Repository: hbase
Updated Branches:
refs/heads/master 1cedeae89 -> 5a05836dd
HBASE-11493 Autorestart option is not working because of stale znode 'shutdown'(Nijel)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5a05836d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5a05836d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5a05836d
Branch: refs/heads/master
Commit: 5a05836dd13deac020443a0d3e84cb7bcfde7552
Parents: 1cedeae
Author: Rajeshbabu Chintaguntla <ra...@apache.org>
Authored: Mon Jul 14 05:32:55 2014 +0000
Committer: Rajeshbabu Chintaguntla <ra...@apache.org>
Committed: Mon Jul 14 05:32:55 2014 +0000
----------------------------------------------------------------------
bin/hbase-daemon.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/5a05836d/bin/hbase-daemon.sh
----------------------------------------------------------------------
diff --git a/bin/hbase-daemon.sh b/bin/hbase-daemon.sh
index caa74d8..649a171 100755
--- a/bin/hbase-daemon.sh
+++ b/bin/hbase-daemon.sh
@@ -214,17 +214,17 @@ case $startStop in
#if the cluster is being stopped then do not restart it again.
zparent=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool zookeeper.znode.parent`
if [ "$zparent" == "null" ]; then zparent="/hbase"; fi
- zshutdown=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool zookeeper.znode.state`
- if [ "$zshutdown" == "null" ]; then zshutdown="shutdown"; fi
- zFullShutdown=$zparent/$zshutdown
- $bin/hbase zkcli stat $zFullShutdown 2>&1 | grep "Node does not exist" 1>/dev/null 2>&1
+ zkrunning=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool zookeeper.znode.state`
+ if [ "$zkrunning" == "null" ]; then zkrunning="running"; fi
+ zkFullRunning=$zparent/$zkrunning
+ $bin/hbase zkcli stat $zkFullRunning 2>&1 | grep "Node does not exist" 1>/dev/null 2>&1
#grep returns 0 if it found something, 1 otherwise
if [ $? -eq 0 ]; then
exit 1
fi
#If ZooKeeper cannot be found, then do not restart
- $bin/hbase zkcli stat $zFullShutdown 2>&1 | grep Exception | grep ConnectionLoss 1>/dev/null 2>&1
+ $bin/hbase zkcli stat $zkFullRunning 2>&1 | grep Exception | grep ConnectionLoss 1>/dev/null 2>&1
if [ $? -eq 0 ]; then
exit 1
fi