git commit: BIGTOP-1125. Return value does not reflect status checks

[ma...@apache.org]

Updated Branches:
  refs/heads/master 8143f75f1 -> ab34e5427


BIGTOP-1125. Return value does not reflect status checks


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ab34e542
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ab34e542
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ab34e542

Branch: refs/heads/master
Commit: ab34e542770246e4848b6d0e84f217eaa0d821ed
Parents: 8143f75
Author: Sean Mackrory <ma...@gmail.com>
Authored: Fri Oct 25 15:42:07 2013 -0700
Committer: Sean Mackrory <ma...@gmail.com>
Committed: Fri Oct 25 15:42:07 2013 -0700

----------------------------------------------------------------------
 .../src/common/hbase/regionserver-init.d.tpl         | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/ab34e542/bigtop-packages/src/common/hbase/regionserver-init.d.tpl
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/regionserver-init.d.tpl b/bigtop-packages/src/common/hbase/regionserver-init.d.tpl
index a85bf46..1588655 100644
--- a/bigtop-packages/src/common/hbase/regionserver-init.d.tpl
+++ b/bigtop-packages/src/common/hbase/regionserver-init.d.tpl
@@ -305,22 +305,24 @@ start() {
     if [ -n "${OFFSETS_FROM_CLI}${OFFSETS_FROM_DEFAULT}" ] ; then
         if hbase_check_pidfile $PID_FILE ; then
             echo "$NAME has already been started - cannot start other @HBASE_DAEMON@ daemons."
-            exit 1
+            return 1
         fi
         multi_hbase_daemon "start"
-        exit $?
+        return $?
     fi
     multi_hbase_daemon_check_pidfiles > /dev/null
     if [ "$?" != "$NO_DAEMONS_RUNNING" ] ; then
       echo "Cannot start $NAME - other @HBASE_DAEMON@ daemons have already been started."
-      exit 1
+      return 1
     fi
     echo -n "Starting $DESC: "
     su -s /bin/bash hbase -c "$DAEMON_SCRIPT start @HBASE_DAEMON@"
     if hbase_check_pidfile $PID_FILE ; then
         echo "$NAME."
+        return $ALL_DAEMONS_RUNNING
     else
         echo "ERROR."
+        return $NO_DAEMONS_RUNNING
     fi
 }
 stop() {
@@ -333,8 +335,10 @@ stop() {
     su -s /bin/bash hbase -c "$DAEMON_SCRIPT stop @HBASE_DAEMON@"
     if hbase_check_pidfile $PID_FILE ; then
         echo "ERROR."
+        return 1
     else
         echo "$NAME."
+        return 0
     fi
 }
 
@@ -380,7 +384,7 @@ status() {
     else
         IFS=''
         echo $MULTI_HBASE_DAEMON_STATUS_TEXT
-        return $MULTI_HBASE_DAEMONS_STATUS
+        return $MULTI_HBASE_DAEMON_STATUS
     fi
 }
 
@@ -407,7 +411,6 @@ case "$1" in
   ;;
   restart)
         restart
-        exit $?
     ;;
   condrestart)
         condrestart
@@ -422,4 +425,4 @@ case "$1" in
   ;;
 esac
 
-exit 0
+exit $?