use java pointed by JAVA_HOME if JAVA_HOME is explicitly set (#5186)

This commit is contained in:
Nishant Bangarwa 2017-12-21 09:08:09 +05:30 committed by Himanshu
parent f57496ed8b
commit e538aa227b
1 changed files with 7 additions and 1 deletions

View File

@ -40,7 +40,13 @@ case $command in
fi fi
if [ ! -d "$PID_DIR" ]; then mkdir -p $PID_DIR; fi if [ ! -d "$PID_DIR" ]; then mkdir -p $PID_DIR; fi
if [ ! -d "$LOG_DIR" ]; then mkdir -p $LOG_DIR; fi if [ ! -d "$LOG_DIR" ]; then mkdir -p $LOG_DIR; fi
nohup java `cat $CONF_DIR/$nodeType/jvm.config | xargs` -cp $CONF_DIR/_common:$CONF_DIR/$nodeType:$LIB_DIR/*:$HADOOP_CONF_DIR io.druid.cli.Main server $nodeType >> $LOG_DIR/$nodeType.log &
JAVA=java
if [ "$JAVA_HOME" != "" ]; then
JAVA=$JAVA_HOME/bin/java
fi
nohup $JAVA `cat $CONF_DIR/$nodeType/jvm.config | xargs` -cp $CONF_DIR/_common:$CONF_DIR/$nodeType:$LIB_DIR/*:$HADOOP_CONF_DIR io.druid.cli.Main server $nodeType >> $LOG_DIR/$nodeType.log 2>&1 &
nodeType_PID=$! nodeType_PID=$!
echo $nodeType_PID > $pid echo $nodeType_PID > $pid
echo "Started $nodeType node ($nodeType_PID)" echo "Started $nodeType node ($nodeType_PID)"