hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmhs...@apache.org
Subject [32/50] [abbrv] hbase git commit: HBASE-12999 Make foreground_start return the correct exit code
Date Sun, 22 Feb 2015 20:56:05 GMT
HBASE-12999 Make foreground_start return the correct exit code


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

Branch: refs/heads/hbase-11339
Commit: a7d93155f10184942ffc146f0694e5da83c78cd4
Parents: fa852c4
Author: Elliott Clark <eclark@apache.org>
Authored: Mon Feb 9 18:26:10 2015 -0800
Committer: Elliott Clark <eclark@apache.org>
Committed: Tue Feb 10 14:36:29 2015 -0800

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/a7d93155/bin/hbase-daemon.sh
----------------------------------------------------------------------
diff --git a/bin/hbase-daemon.sh b/bin/hbase-daemon.sh
index 94ab2d1..e411dad 100755
--- a/bin/hbase-daemon.sh
+++ b/bin/hbase-daemon.sh
@@ -205,15 +205,15 @@ case $startStop in
     # Add to the command log file vital stats on our environment.
     echo "`date` Starting $command on `hostname`" >> ${HBASE_LOGLOG}
     `ulimit -a` >> "$HBASE_LOGLOG" 2>&1
-    nice -n $HBASE_NICENESS "$HBASE_HOME"/bin/hbase \
-        --config "${HBASE_CONF_DIR}" \
-        $command "$@" start >> ${HBASE_LOGOUT} 2>&1 &
-    echo $! > ${HBASE_PID}
     # in case the parent shell gets the kill make sure to trap signals.
     # Only one will get called. Either the trap or the flow will go through.
     trap cleanAfterRun SIGHUP SIGINT SIGTERM EXIT
-    wait
-    cleanAfterRun
+    nice -n $HBASE_NICENESS "$HBASE_HOME"/bin/hbase \
+        --config "${HBASE_CONF_DIR}" \
+        $command "$@" start >> ${HBASE_LOGOUT} 2>&1 &
+    hbase_pid=$!
+    echo $hbase_pid > ${HBASE_PID}
+    wait $hbase_pid
   ;;
 
 (internal_autorestart)


Mime
View raw message