HBASE-13927 Allow hbase-daemon.sh to conditionally redirect the log or not
Signed-off-by: Sean Busbey <busbey@apache.org>
This commit is contained in:
parent
d26978a2ff
commit
608c3aa15c
@ -202,15 +202,26 @@ case $startStop in
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
(foreground_start)
|
(foreground_start)
|
||||||
# Add to the command log file vital stats on our environment.
|
trap cleanAfterRun SIGHUP SIGINT SIGTERM EXIT
|
||||||
|
if [ "$HBASE_NO_REDIRECT_LOG" != "" ]; then
|
||||||
|
# NO REDIRECT
|
||||||
|
echo "`date` Starting $command on `hostname`"
|
||||||
|
echo "`ulimit -a`"
|
||||||
|
# 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.
|
||||||
|
nice -n $HBASE_NICENESS "$HBASE_HOME"/bin/hbase \
|
||||||
|
--config "${HBASE_CONF_DIR}" \
|
||||||
|
$command "$@" start &
|
||||||
|
else
|
||||||
echo "`date` Starting $command on `hostname`" >> ${HBASE_LOGLOG}
|
echo "`date` Starting $command on `hostname`" >> ${HBASE_LOGLOG}
|
||||||
echo "`ulimit -a`" >> "$HBASE_LOGLOG" 2>&1
|
echo "`ulimit -a`" >> "$HBASE_LOGLOG" 2>&1
|
||||||
# in case the parent shell gets the kill make sure to trap signals.
|
# 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.
|
# Only one will get called. Either the trap or the flow will go through.
|
||||||
trap cleanAfterRun SIGHUP SIGINT SIGTERM EXIT
|
|
||||||
nice -n $HBASE_NICENESS "$HBASE_HOME"/bin/hbase \
|
nice -n $HBASE_NICENESS "$HBASE_HOME"/bin/hbase \
|
||||||
--config "${HBASE_CONF_DIR}" \
|
--config "${HBASE_CONF_DIR}" \
|
||||||
$command "$@" start >> ${HBASE_LOGOUT} 2>&1 &
|
$command "$@" start >> ${HBASE_LOGOUT} 2>&1 &
|
||||||
|
fi
|
||||||
|
# Add to the command log file vital stats on our environment.
|
||||||
hbase_pid=$!
|
hbase_pid=$!
|
||||||
echo $hbase_pid > ${HBASE_PID}
|
echo $hbase_pid > ${HBASE_PID}
|
||||||
wait $hbase_pid
|
wait $hbase_pid
|
||||||
|
Loading…
x
Reference in New Issue
Block a user