#1203 Move bin/setenv.sh to conf
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/57c1d5e0 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/57c1d5e0 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/57c1d5e0 Branch: refs/heads/master Commit: 57c1d5e03f5cf07ccfb02f7711375c4aa72dd7a6 Parents: cfac81b Author: Hongbin Ma <[email protected]> Authored: Thu Jun 22 15:24:20 2017 +0800 Committer: Roger Shi <[email protected]> Committed: Thu Jun 22 17:59:14 2017 +0800 ---------------------------------------------------------------------- build/bin/kylin.sh | 5 +++++ build/bin/setenv.sh | 57 ----------------------------------------------- build/conf/setenv.sh | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/57c1d5e0/build/bin/kylin.sh ---------------------------------------------------------------------- diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh index a5808fd..08c9075 100755 --- a/build/bin/kylin.sh +++ b/build/bin/kylin.sh @@ -41,8 +41,13 @@ function retrieveDependency() { #retrive $KYLIN_EXTRA_START_OPTS if [ -f "${dir}/setenv.sh" ]; then + echo "WARNING: ${dir}/setenv.sh is deprecated and ignored, please remove it and use ${KYLIN_HOME}/conf/setenv.sh instead" source ${dir}/setenv.sh fi + + if [ -f "${KYLIN_HOME}/conf/setenv.sh" ]; then + source ${KYLIN_HOME}/conf/setenv.sh + fi export HBASE_CLASSPATH_PREFIX=${KYLIN_HOME}/conf:${KYLIN_HOME}/lib/*:${KYLIN_HOME}/ext/*:${HBASE_CLASSPATH_PREFIX} export HBASE_CLASSPATH=${HBASE_CLASSPATH}:${hive_dependency}:${kafka_dependency}:${spark_dependency} http://git-wip-us.apache.org/repos/asf/kylin/blob/57c1d5e0/build/bin/setenv.sh ---------------------------------------------------------------------- diff --git a/build/bin/setenv.sh b/build/bin/setenv.sh deleted file mode 100755 index 0e9b185..0000000 --- a/build/bin/setenv.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# source me - -# (if your're deploying KYLIN on a powerful server and want to replace the default conservative settings) -# uncomment following to for it to take effect -export KYLIN_JVM_SETTINGS="-Xms1024M -Xmx4096M -Xss1024K -XX:MaxPermSize=128M -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$KYLIN_HOME/logs/kylin.gc.$$ -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=64M" -# export KYLIN_JVM_SETTINGS="-Xms16g -Xmx16g -XX:MaxPermSize=512m -XX:NewSize=3g -XX:MaxNewSize=3g -XX:SurvivorRatio=4 -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly -XX:+DisableExplicitGC -XX:+HeapDumpOnOutOfMemoryError" - -# uncomment following to for it to take effect(the values need adjusting to fit your env) -# export KYLIN_DEBUG_SETTINGS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" - -# uncomment following to for it to take effect(the values need adjusting to fit your env) -# export KYLIN_LD_LIBRARY_SETTINGS="-Djava.library.path=/apache/hadoop/lib/native/Linux-amd64-64" - -export KYLIN_EXTRA_START_OPTS="" - -if [ ! -z "${KYLIN_JVM_SETTINGS}" ] -then - verbose "KYLIN_JVM_SETTINGS is ${KYLIN_JVM_SETTINGS}" - KYLIN_EXTRA_START_OPTS="${KYLIN_JVM_SETTINGS} ${KYLIN_EXTRA_START_OPTS}" -else - verbose "KYLIN_JVM_SETTINGS is not set, using default jvm settings: ${KYLIN_JVM_SETTINGS}" -fi - -if [ ! -z "${KYLIN_DEBUG_SETTINGS}" ] -then - verbose "KYLIN_DEBUG_SETTINGS is ${KYLIN_DEBUG_SETTINGS}" - KYLIN_EXTRA_START_OPTS="${KYLIN_DEBUG_SETTINGS} ${KYLIN_EXTRA_START_OPTS}" -else - verbose "KYLIN_DEBUG_SETTINGS is not set, will not enable remote debuging" -fi - -if [ ! -z "${KYLIN_LD_LIBRARY_SETTINGS}" ] -then - verbose "KYLIN_LD_LIBRARY_SETTINGS is ${KYLIN_LD_LIBRARY_SETTINGS}" - KYLIN_EXTRA_START_OPTS="${KYLIN_LD_LIBRARY_SETTINGS} ${KYLIN_EXTRA_START_OPTS}" -else - verbose "KYLIN_LD_LIBRARY_SETTINGS is not set, it is okay unless you want to specify your own native path" -fi http://git-wip-us.apache.org/repos/asf/kylin/blob/57c1d5e0/build/conf/setenv.sh ---------------------------------------------------------------------- diff --git a/build/conf/setenv.sh b/build/conf/setenv.sh new file mode 100755 index 0000000..0e9b185 --- /dev/null +++ b/build/conf/setenv.sh @@ -0,0 +1,57 @@ +#!/bin/bash + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# source me + +# (if your're deploying KYLIN on a powerful server and want to replace the default conservative settings) +# uncomment following to for it to take effect +export KYLIN_JVM_SETTINGS="-Xms1024M -Xmx4096M -Xss1024K -XX:MaxPermSize=128M -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$KYLIN_HOME/logs/kylin.gc.$$ -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=64M" +# export KYLIN_JVM_SETTINGS="-Xms16g -Xmx16g -XX:MaxPermSize=512m -XX:NewSize=3g -XX:MaxNewSize=3g -XX:SurvivorRatio=4 -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly -XX:+DisableExplicitGC -XX:+HeapDumpOnOutOfMemoryError" + +# uncomment following to for it to take effect(the values need adjusting to fit your env) +# export KYLIN_DEBUG_SETTINGS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" + +# uncomment following to for it to take effect(the values need adjusting to fit your env) +# export KYLIN_LD_LIBRARY_SETTINGS="-Djava.library.path=/apache/hadoop/lib/native/Linux-amd64-64" + +export KYLIN_EXTRA_START_OPTS="" + +if [ ! -z "${KYLIN_JVM_SETTINGS}" ] +then + verbose "KYLIN_JVM_SETTINGS is ${KYLIN_JVM_SETTINGS}" + KYLIN_EXTRA_START_OPTS="${KYLIN_JVM_SETTINGS} ${KYLIN_EXTRA_START_OPTS}" +else + verbose "KYLIN_JVM_SETTINGS is not set, using default jvm settings: ${KYLIN_JVM_SETTINGS}" +fi + +if [ ! -z "${KYLIN_DEBUG_SETTINGS}" ] +then + verbose "KYLIN_DEBUG_SETTINGS is ${KYLIN_DEBUG_SETTINGS}" + KYLIN_EXTRA_START_OPTS="${KYLIN_DEBUG_SETTINGS} ${KYLIN_EXTRA_START_OPTS}" +else + verbose "KYLIN_DEBUG_SETTINGS is not set, will not enable remote debuging" +fi + +if [ ! -z "${KYLIN_LD_LIBRARY_SETTINGS}" ] +then + verbose "KYLIN_LD_LIBRARY_SETTINGS is ${KYLIN_LD_LIBRARY_SETTINGS}" + KYLIN_EXTRA_START_OPTS="${KYLIN_LD_LIBRARY_SETTINGS} ${KYLIN_EXTRA_START_OPTS}" +else + verbose "KYLIN_LD_LIBRARY_SETTINGS is not set, it is okay unless you want to specify your own native path" +fi
