This is an automated email from the ASF dual-hosted git repository. xxyu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push: new d86ec25 KYLIN-4770: Move Kylin service on k8s from background to foreground d86ec25 is described below commit d86ec25d4af21db86207e8e481272fbc27e31951 Author: tianhui5 <tianh...@xiaomi.com> AuthorDate: Tue Sep 22 18:40:47 2020 +0800 KYLIN-4770: Move Kylin service on k8s from background to foreground --- build/bin/kylin.sh | 30 +++++++++++++++++++++++++ kubernetes/docker/kylin-client/Dockerfile | 2 +- kubernetes/docker/kylin-client/bin/bootstrap.sh | 8 ++----- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh index b7668d8..56e21a5 100755 --- a/build/bin/kylin.sh +++ b/build/bin/kylin.sh @@ -302,6 +302,36 @@ then -Dkylin.hbase.dependency=${hbase_dependency} \ org.apache.kylin.stream.server.StreamingReceiver $@ > ${KYLIN_HOME}/logs/streaming_receiver.out 2>&1 & echo $! > ${KYLIN_HOME}/streaming_receiver_pid & exit 0 + elif [ "$2" == "run" ] + then + if [ -f "${KYLIN_HOME}/streaming_receiver_pid" ] + then + PID=`cat $KYLIN_HOME/streaming_receiver_pid` + if ps -p $PID > /dev/null + then + echo "Kylin is running, stop it first" + exit 1 + fi + fi + #retrive $hbase_dependency + source ${dir}/find-hbase-dependency.sh + #retrive $KYLIN_EXTRA_START_OPTS + if [ -f "${KYLIN_HOME}/conf/setenv.sh" ] + then source ${KYLIN_HOME}/conf/setenv.sh + fi + + mkdir -p ${KYLIN_HOME}/ext + HBASE_CLASSPATH=`hbase classpath` + #echo "hbase class path:"$HBASE_CLASSPATH + STREAM_CLASSPATH=${KYLIN_HOME}/lib/streaming/*:${KYLIN_HOME}/ext/*:${HBASE_CLASSPATH} + + # KYLIN_EXTRA_START_OPTS is for customized settings, checkout bin/setenv.sh + ${JAVA_HOME}/bin/java -cp $STREAM_CLASSPATH ${KYLIN_EXTRA_START_OPTS} \ + -Dlog4j.configuration=stream-receiver-log4j.properties\ + -DKYLIN_HOME=${KYLIN_HOME}\ + -Dkylin.hbase.dependency=${hbase_dependency} \ + org.apache.kylin.stream.server.StreamingReceiver $@ + exit 0 elif [ "$2" == "stop" ] then if [ ! -f "${KYLIN_HOME}/streaming_receiver_pid" ] diff --git a/kubernetes/docker/kylin-client/Dockerfile b/kubernetes/docker/kylin-client/Dockerfile index ef30645..2e4ae7a 100644 --- a/kubernetes/docker/kylin-client/Dockerfile +++ b/kubernetes/docker/kylin-client/Dockerfile @@ -79,4 +79,4 @@ RUN /usr/bin/crontab -u $USER /tmp/crontab.txt \ EXPOSE 7070 USER $USER -CMD ["sh", "-c", "$TOOL_HOME/bootstrap.sh server -d"] \ No newline at end of file +CMD ["sh", "-c", "$TOOL_HOME/bootstrap.sh server"] \ No newline at end of file diff --git a/kubernetes/docker/kylin-client/bin/bootstrap.sh b/kubernetes/docker/kylin-client/bin/bootstrap.sh index a38a0b2..02291c2 100755 --- a/kubernetes/docker/kylin-client/bin/bootstrap.sh +++ b/kubernetes/docker/kylin-client/bin/bootstrap.sh @@ -24,11 +24,7 @@ sudo crond -i -p sleep 60 if [[ $1 == "server" ]]; then - $KYLIN_HOME/bin/kylin.sh start + $KYLIN_HOME/bin/kylin.sh run > ${KYLIN_HOME}/log/kylin.out 2>&1 elif [[ $1 == "streaming" ]]; then - $KYLIN_HOME/bin/kylin.sh streaming start -fi - -if [[ $2 == "-d" ]]; then - while true; do sleep 3000; done + $KYLIN_HOME/bin/kylin.sh streaming run > ${KYLIN_HOME}/log/streaming_receiver.out 2>&1 fi