From 9084a0f9cb292c39c653dde11dc407a37b50e943 Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Mon, 9 Feb 2015 18:26:10 -0800 Subject: [PATCH] HBASE-12999 Make foreground_start return the correct exit code --- bin/hbase-daemon.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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) -- 2.2.1