minor refactor of scripts
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/0a95de00 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/0a95de00 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/0a95de00 Branch: refs/heads/master Commit: 0a95de0049e5bc2c0707618266141116e6f9a139 Parents: 58a6307 Author: Yang Li <liy...@apache.org> Authored: Sat Jun 3 15:59:08 2017 +0800 Committer: liyang-gmt8 <liy...@apache.org> Committed: Sat Jun 3 21:35:01 2017 +0800 ---------------------------------------------------------------------- build/bin/check-acl-migration.sh | 42 +++++++ build/bin/check-env.sh | 0 build/bin/check_acl_migration.sh | 42 ------- build/bin/diag.sh | 0 build/bin/find-hadoop-conf-dir.sh | 4 +- build/bin/find-hbase-dependency.sh | 2 +- build/bin/find-hive-dependency.sh | 2 +- build/bin/find-kafka-dependency.sh | 4 +- build/bin/find-spark-dependency.sh | 0 build/bin/header.sh | 0 build/bin/health-check.sh | 0 build/bin/kylin-port-replace-util.sh | 120 +++++++++++++++++++ build/bin/kylin.sh | 2 +- build/bin/kylin_port_replace_util.sh | 120 ------------------- build/bin/load-hive-conf.sh | 0 build/bin/sample.sh | 0 build/bin/setenv.sh | 2 +- build/script/prepare-libs.sh | 42 +++++++ build/script/prepare.sh | 2 +- build/script/prepare_libs.sh | 42 ------- .../engine/mr/common/AbstractHadoopJob.java | 8 -- .../apache/kylin/tool/AclTableMigrationCLI.java | 4 +- 22 files changed, 215 insertions(+), 223 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/check-acl-migration.sh ---------------------------------------------------------------------- diff --git a/build/bin/check-acl-migration.sh b/build/bin/check-acl-migration.sh new file mode 100755 index 0000000..1259f09 --- /dev/null +++ b/build/bin/check-acl-migration.sh @@ -0,0 +1,42 @@ +#!/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. +# + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +function error() { + SCRIPT="$0" # script name + LASTLINE="$1" # line of error occurrence + LASTERR="$2" # error code + echo "ERROR exit from ${SCRIPT} : line ${LASTLINE} with exit code ${LASTERR}" + exit 1 +} +trap 'error ${LINENO} ${?}' ERR + + +#check kylin home +if [ -z "$KYLIN_HOME" ] +then + echo 'Please make sure KYLIN_HOME has been set' + exit 1 +else + echo "KYLIN_HOME is set to ${KYLIN_HOME}" +fi + +echo "Start to check whether we need to migrate acl tables" +${KYLIN_HOME}/bin/kylin.sh org.apache.kylin.tool.AclTableMigrationCLI CHECK \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/check-env.sh ---------------------------------------------------------------------- diff --git a/build/bin/check-env.sh b/build/bin/check-env.sh old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/check_acl_migration.sh ---------------------------------------------------------------------- diff --git a/build/bin/check_acl_migration.sh b/build/bin/check_acl_migration.sh deleted file mode 100644 index 1259f09..0000000 --- a/build/bin/check_acl_migration.sh +++ /dev/null @@ -1,42 +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. -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -function error() { - SCRIPT="$0" # script name - LASTLINE="$1" # line of error occurrence - LASTERR="$2" # error code - echo "ERROR exit from ${SCRIPT} : line ${LASTLINE} with exit code ${LASTERR}" - exit 1 -} -trap 'error ${LINENO} ${?}' ERR - - -#check kylin home -if [ -z "$KYLIN_HOME" ] -then - echo 'Please make sure KYLIN_HOME has been set' - exit 1 -else - echo "KYLIN_HOME is set to ${KYLIN_HOME}" -fi - -echo "Start to check whether we need to migrate acl tables" -${KYLIN_HOME}/bin/kylin.sh org.apache.kylin.tool.AclTableMigrationCLI CHECK \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/diag.sh ---------------------------------------------------------------------- diff --git a/build/bin/diag.sh b/build/bin/diag.sh old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/find-hadoop-conf-dir.sh ---------------------------------------------------------------------- diff --git a/build/bin/find-hadoop-conf-dir.sh b/build/bin/find-hadoop-conf-dir.sh old mode 100644 new mode 100755 index 5334b8a..403bc97 --- a/build/bin/find-hadoop-conf-dir.sh +++ b/build/bin/find-hadoop-conf-dir.sh @@ -24,7 +24,7 @@ echo Retrieving hadoop conf dir... override_hadoop_conf_dir=`bash ${KYLIN_HOME}/bin/get-properties.sh kylin.env.hadoop-conf-dir` if [ -n "$override_hadoop_conf_dir" ]; then - echo "$override_hadoop_conf_dir is override as the kylin_hadoop_conf_dir" + verbose "kylin_hadoop_conf_dir is override as $override_hadoop_conf_dir" export kylin_hadoop_conf_dir=${override_hadoop_conf_dir} return fi @@ -69,7 +69,7 @@ do continue fi - verbose "$result is chosen as the kylin_hadoop_conf_dir" + verbose "kylin_hadoop_conf_dir is $result" export kylin_hadoop_conf_dir=$result return fi http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/find-hbase-dependency.sh ---------------------------------------------------------------------- diff --git a/build/bin/find-hbase-dependency.sh b/build/bin/find-hbase-dependency.sh old mode 100644 new mode 100755 index 14dde3b..c98b5ac --- a/build/bin/find-hbase-dependency.sh +++ b/build/bin/find-hbase-dependency.sh @@ -25,7 +25,7 @@ hbase_classpath=`hbase classpath` # special handling for Amazon EMR, to prevent re-init of hbase-setenv is_aws=`uname -r | grep amzn` -if [ -n is_aws ] && [ -d "/usr/lib/oozie/lib" ]; then +if [ -n "$is_aws" ] && [ -d "/usr/lib/oozie/lib" ]; then export HBASE_ENV_INIT="true" fi http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/find-hive-dependency.sh ---------------------------------------------------------------------- diff --git a/build/bin/find-hive-dependency.sh b/build/bin/find-hive-dependency.sh old mode 100644 new mode 100755 index 8841687..0830015 --- a/build/bin/find-hive-dependency.sh +++ b/build/bin/find-hive-dependency.sh @@ -155,6 +155,6 @@ checkFileExist ${hive_lib} checkFileExist ${hcatalog} hive_dependency=${hive_conf_path}:${hive_lib}:${hcatalog} -verbose "hive dependency: $hive_dependency" +verbose "hive dependency is $hive_dependency" export hive_dependency http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/find-kafka-dependency.sh ---------------------------------------------------------------------- diff --git a/build/bin/find-kafka-dependency.sh b/build/bin/find-kafka-dependency.sh old mode 100644 new mode 100755 index 999face..500d0cd --- a/build/bin/find-kafka-dependency.sh +++ b/build/bin/find-kafka-dependency.sh @@ -45,10 +45,10 @@ then then quit "kafka client lib not found" else - verbose "kafka dependency: $kafka_dependency" + verbose "kafka dependency is $kafka_dependency" export kafka_dependency fi else - verbose "kafka dependency: $kafka_dependency" + verbose "kafka dependency is $kafka_dependency" export kafka_dependency fi http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/find-spark-dependency.sh ---------------------------------------------------------------------- diff --git a/build/bin/find-spark-dependency.sh b/build/bin/find-spark-dependency.sh old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/header.sh ---------------------------------------------------------------------- diff --git a/build/bin/header.sh b/build/bin/header.sh old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/health-check.sh ---------------------------------------------------------------------- diff --git a/build/bin/health-check.sh b/build/bin/health-check.sh old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/kylin-port-replace-util.sh ---------------------------------------------------------------------- diff --git a/build/bin/kylin-port-replace-util.sh b/build/bin/kylin-port-replace-util.sh new file mode 100755 index 0000000..47b0d74 --- /dev/null +++ b/build/bin/kylin-port-replace-util.sh @@ -0,0 +1,120 @@ +#!/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. +# + +#exit if find error +# ============================================================================ + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +function error() { + SCRIPT="$0" # script name + LASTLINE="$1" # line of error occurrence + LASTERR="$2" # error code + echo "ERROR exit from ${SCRIPT} : line ${LASTLINE} with exit code ${LASTERR}" + exit 1 +} +trap 'error ${LINENO} ${?}' ERR + + +#check input parameters +if [ $# -eq 0 ]; then + echo "Usage : port_offset_util.sh set PORT_OFFSET --> Modify all conflict ports base on a offset" + echo "Usage : port_offset_util.sh reset --> Recover to original setting" + exit 0 +fi + +#check kylin home +if [ -z "$KYLIN_HOME" ] +then + echo 'Please make sure KYLIN_HOME has been set' + exit 1 +else + echo "KYLIN_HOME is set to ${KYLIN_HOME}" +fi + +#variables +TOMCAT_INIT_FILE="${KYLIN_HOME}/tomcat/conf/server.xml.init" +TOMCAT_BACKUP_FILE="${KYLIN_HOME}/tomcat/conf/server.xml.backup" +TOMCAT_CONFIG_FILE="${KYLIN_HOME}/tomcat/conf/server.xml" +KYLIN_CONFIG_FILE="${KYLIN_HOME}/conf/kylin.properties" +KYLIN_BACKUP_FILE="${KYLIN_HOME}/conf/kylin.properties.backup" +TOMCAT_PORT_LIST=(9005 7070 9443 7443 9009) +KYLIN_DEFAULT_PORT=7070 + +if [ "$1" == "set" ] +then + OFFSET=$2 + echo "Port offset is : ${OFFSET}" + + #check config file exist + if [ ! -f ${KYLIN_CONFIG_FILE} ] || [ ! -f ${TOMCAT_CONFIG_FILE} ]; then + echo "Some of the config file not exist" + exit 1 + fi + + + #backup tomccat file + if [ ! -f ${TOMCAT_BACKUP_FILE} ]; then + cp -f ${TOMCAT_CONFIG_FILE} ${TOMCAT_BACKUP_FILE} + fi + + #force reset + cp -f ${TOMCAT_INIT_FILE} ${TOMCAT_CONFIG_FILE} #reset if exist + + #back or reset + if [ ! -f ${KYLIN_BACKUP_FILE} ]; then #backup if not exist + cp -f ${KYLIN_CONFIG_FILE} ${KYLIN_BACKUP_FILE} + else + cp -r ${KYLIN_BACKUP_FILE} ${KYLIN_CONFIG_FILE} #reset if exist + fi + + + #replace ports in kylin.properties + new_kylin_port=`expr ${KYLIN_DEFAULT_PORT} + ${OFFSET}` + + sed -i "s/kylin.server.cluster-servers=\(.*\).*:\(.*\)/kylin.server.cluster-servers=\1:${new_kylin_port}/g" ${KYLIN_CONFIG_FILE} + + echo "New kylin port is : ${new_kylin_port}" + + #replace ports in server.xml + + for port in ${TOMCAT_PORT_LIST[@]} + do + new_port=`expr ${port} + ${OFFSET} ` + #echo "Replace old port : ${port} to new port : ${new_port}" + sed -i "s/$port/${new_port}/g" ${TOMCAT_CONFIG_FILE} + + done + echo "Files below modified:" + echo ${KYLIN_CONFIG_FILE} + echo ${TOMCAT_CONFIG_FILE} +elif [ "$1" == "reset" ] +then + #reset kylin.properties + cp -f ${KYLIN_BACKUP_FILE} ${KYLIN_CONFIG_FILE} + cp -f ${TOMCAT_BACKUP_FILE} ${TOMCAT_CONFIG_FILE} + rm -f ${KYLIN_BACKUP_FILE} + rm -f ${TOMCAT_BACKUP_FILE} + echo "Files below reset to original:" + echo ${KYLIN_CONFIG_FILE} + echo ${TOMCAT_CONFIG_FILE} +else + echo "Unrecognized command" + exit 1 +fi http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/kylin.sh ---------------------------------------------------------------------- diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh old mode 100644 new mode 100755 index d9e932e..3efa43e --- a/build/bin/kylin.sh +++ b/build/bin/kylin.sh @@ -95,7 +95,7 @@ then quit "Port ${kylin_rest_address} is not available, could not start Kylin." fi - ${KYLIN_HOME}/bin/check_acl_migration.sh || { exit 1; } + ${KYLIN_HOME}/bin/check-acl-migration.sh || { exit 1; } #debug if encounter NoClassDefError verbose "kylin classpath is: $(hbase classpath)" http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/kylin_port_replace_util.sh ---------------------------------------------------------------------- diff --git a/build/bin/kylin_port_replace_util.sh b/build/bin/kylin_port_replace_util.sh deleted file mode 100755 index 47b0d74..0000000 --- a/build/bin/kylin_port_replace_util.sh +++ /dev/null @@ -1,120 +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. -# - -#exit if find error -# ============================================================================ - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -function error() { - SCRIPT="$0" # script name - LASTLINE="$1" # line of error occurrence - LASTERR="$2" # error code - echo "ERROR exit from ${SCRIPT} : line ${LASTLINE} with exit code ${LASTERR}" - exit 1 -} -trap 'error ${LINENO} ${?}' ERR - - -#check input parameters -if [ $# -eq 0 ]; then - echo "Usage : port_offset_util.sh set PORT_OFFSET --> Modify all conflict ports base on a offset" - echo "Usage : port_offset_util.sh reset --> Recover to original setting" - exit 0 -fi - -#check kylin home -if [ -z "$KYLIN_HOME" ] -then - echo 'Please make sure KYLIN_HOME has been set' - exit 1 -else - echo "KYLIN_HOME is set to ${KYLIN_HOME}" -fi - -#variables -TOMCAT_INIT_FILE="${KYLIN_HOME}/tomcat/conf/server.xml.init" -TOMCAT_BACKUP_FILE="${KYLIN_HOME}/tomcat/conf/server.xml.backup" -TOMCAT_CONFIG_FILE="${KYLIN_HOME}/tomcat/conf/server.xml" -KYLIN_CONFIG_FILE="${KYLIN_HOME}/conf/kylin.properties" -KYLIN_BACKUP_FILE="${KYLIN_HOME}/conf/kylin.properties.backup" -TOMCAT_PORT_LIST=(9005 7070 9443 7443 9009) -KYLIN_DEFAULT_PORT=7070 - -if [ "$1" == "set" ] -then - OFFSET=$2 - echo "Port offset is : ${OFFSET}" - - #check config file exist - if [ ! -f ${KYLIN_CONFIG_FILE} ] || [ ! -f ${TOMCAT_CONFIG_FILE} ]; then - echo "Some of the config file not exist" - exit 1 - fi - - - #backup tomccat file - if [ ! -f ${TOMCAT_BACKUP_FILE} ]; then - cp -f ${TOMCAT_CONFIG_FILE} ${TOMCAT_BACKUP_FILE} - fi - - #force reset - cp -f ${TOMCAT_INIT_FILE} ${TOMCAT_CONFIG_FILE} #reset if exist - - #back or reset - if [ ! -f ${KYLIN_BACKUP_FILE} ]; then #backup if not exist - cp -f ${KYLIN_CONFIG_FILE} ${KYLIN_BACKUP_FILE} - else - cp -r ${KYLIN_BACKUP_FILE} ${KYLIN_CONFIG_FILE} #reset if exist - fi - - - #replace ports in kylin.properties - new_kylin_port=`expr ${KYLIN_DEFAULT_PORT} + ${OFFSET}` - - sed -i "s/kylin.server.cluster-servers=\(.*\).*:\(.*\)/kylin.server.cluster-servers=\1:${new_kylin_port}/g" ${KYLIN_CONFIG_FILE} - - echo "New kylin port is : ${new_kylin_port}" - - #replace ports in server.xml - - for port in ${TOMCAT_PORT_LIST[@]} - do - new_port=`expr ${port} + ${OFFSET} ` - #echo "Replace old port : ${port} to new port : ${new_port}" - sed -i "s/$port/${new_port}/g" ${TOMCAT_CONFIG_FILE} - - done - echo "Files below modified:" - echo ${KYLIN_CONFIG_FILE} - echo ${TOMCAT_CONFIG_FILE} -elif [ "$1" == "reset" ] -then - #reset kylin.properties - cp -f ${KYLIN_BACKUP_FILE} ${KYLIN_CONFIG_FILE} - cp -f ${TOMCAT_BACKUP_FILE} ${TOMCAT_CONFIG_FILE} - rm -f ${KYLIN_BACKUP_FILE} - rm -f ${TOMCAT_BACKUP_FILE} - echo "Files below reset to original:" - echo ${KYLIN_CONFIG_FILE} - echo ${TOMCAT_CONFIG_FILE} -else - echo "Unrecognized command" - exit 1 -fi http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/load-hive-conf.sh ---------------------------------------------------------------------- diff --git a/build/bin/load-hive-conf.sh b/build/bin/load-hive-conf.sh old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/sample.sh ---------------------------------------------------------------------- diff --git a/build/bin/sample.sh b/build/bin/sample.sh old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/bin/setenv.sh ---------------------------------------------------------------------- diff --git a/build/bin/setenv.sh b/build/bin/setenv.sh index d838362..0e9b185 100755 --- a/build/bin/setenv.sh +++ b/build/bin/setenv.sh @@ -34,7 +34,7 @@ export KYLIN_EXTRA_START_OPTS="" if [ ! -z "${KYLIN_JVM_SETTINGS}" ] then - echo "KYLIN_JVM_SETTINGS is ${KYLIN_JVM_SETTINGS}" + 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}" http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/script/prepare-libs.sh ---------------------------------------------------------------------- diff --git a/build/script/prepare-libs.sh b/build/script/prepare-libs.sh new file mode 100644 index 0000000..ae5c5e4 --- /dev/null +++ b/build/script/prepare-libs.sh @@ -0,0 +1,42 @@ +#!/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. +# + +dir=$(dirname ${0}) +cd ${dir}/../.. + +if [ -z "$version" ] +then + echo 'version not set' + version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -E '^[0-9]+\.[0-9]+\.[0-9]+' ` +fi +echo "version ${version}" + +echo "copy lib file" +rm -rf build/lib build/tool +mkdir build/lib build/tool +cp assembly/target/kylin-assembly-${version}-job.jar build/lib/kylin-job-${version}.jar +cp storage-hbase/target/kylin-storage-hbase-${version}-coprocessor.jar build/lib/kylin-coprocessor-${version}.jar +cp jdbc/target/kylin-jdbc-${version}.jar build/lib/kylin-jdbc-${version}.jar +cp tool-assembly/target/kylin-tool-assembly-${version}-assembly.jar build/tool/kylin-tool-${version}.jar + +# Copied file becomes 000 for some env (e.g. my Cygwin) +chmod 644 build/lib/kylin-job-${version}.jar +chmod 644 build/lib/kylin-coprocessor-${version}.jar +chmod 644 build/lib/kylin-jdbc-${version}.jar +chmod 644 build/tool/kylin-tool-${version}.jar http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/script/prepare.sh ---------------------------------------------------------------------- diff --git a/build/script/prepare.sh b/build/script/prepare.sh index a8dde10..deaf58d 100755 --- a/build/script/prepare.sh +++ b/build/script/prepare.sh @@ -28,7 +28,7 @@ fi echo "version ${version}" export version -sh build/script/prepare_libs.sh || { exit 1; } +sh build/script/prepare-libs.sh || { exit 1; } cp server/target/kylin-server-${version}.war build/tomcat/webapps/kylin.war chmod 644 build/tomcat/webapps/kylin.war http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/build/script/prepare_libs.sh ---------------------------------------------------------------------- diff --git a/build/script/prepare_libs.sh b/build/script/prepare_libs.sh deleted file mode 100755 index ae5c5e4..0000000 --- a/build/script/prepare_libs.sh +++ /dev/null @@ -1,42 +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. -# - -dir=$(dirname ${0}) -cd ${dir}/../.. - -if [ -z "$version" ] -then - echo 'version not set' - version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -E '^[0-9]+\.[0-9]+\.[0-9]+' ` -fi -echo "version ${version}" - -echo "copy lib file" -rm -rf build/lib build/tool -mkdir build/lib build/tool -cp assembly/target/kylin-assembly-${version}-job.jar build/lib/kylin-job-${version}.jar -cp storage-hbase/target/kylin-storage-hbase-${version}-coprocessor.jar build/lib/kylin-coprocessor-${version}.jar -cp jdbc/target/kylin-jdbc-${version}.jar build/lib/kylin-jdbc-${version}.jar -cp tool-assembly/target/kylin-tool-assembly-${version}-assembly.jar build/tool/kylin-tool-${version}.jar - -# Copied file becomes 000 for some env (e.g. my Cygwin) -chmod 644 build/lib/kylin-job-${version}.jar -chmod 644 build/lib/kylin-coprocessor-${version}.jar -chmod 644 build/lib/kylin-jdbc-${version}.jar -chmod 644 build/tool/kylin-tool-${version}.jar http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java index abfa224..f9d9808 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java @@ -166,9 +166,7 @@ public abstract class AbstractHadoopJob extends Configured implements Tool { } String kylinHiveDependency = System.getProperty("kylin.hive.dependency"); - String kylinHBaseDependency = System.getProperty("kylin.hbase.dependency"); String kylinKafkaDependency = System.getProperty("kylin.kafka.dependency"); - logger.trace("append kylin.hbase.dependency: " + kylinHBaseDependency + " to " + MAP_REDUCE_CLASSPATH); Configuration jobConf = job.getConfiguration(); String classpath = jobConf.get(MAP_REDUCE_CLASSPATH); @@ -178,12 +176,6 @@ public abstract class AbstractHadoopJob extends Configured implements Tool { logger.info("The default mapred classpath is: " + classpath); } - if (kylinHBaseDependency != null) { - // yarn classpath is comma separated - kylinHBaseDependency = kylinHBaseDependency.replace(":", ","); - classpath = classpath + "," + kylinHBaseDependency; - } - jobConf.set(MAP_REDUCE_CLASSPATH, classpath); logger.trace("Hadoop job classpath is: " + job.getConfiguration().get(MAP_REDUCE_CLASSPATH)); http://git-wip-us.apache.org/repos/asf/kylin/blob/0a95de00/tool/src/main/java/org/apache/kylin/tool/AclTableMigrationCLI.java ---------------------------------------------------------------------- diff --git a/tool/src/main/java/org/apache/kylin/tool/AclTableMigrationCLI.java b/tool/src/main/java/org/apache/kylin/tool/AclTableMigrationCLI.java index 6c8a6b0..c42254b 100644 --- a/tool/src/main/java/org/apache/kylin/tool/AclTableMigrationCLI.java +++ b/tool/src/main/java/org/apache/kylin/tool/AclTableMigrationCLI.java @@ -40,8 +40,8 @@ public class AclTableMigrationCLI { case CHECK: boolean needMigrate = tool.checkIfNeedMigrate(KylinConfig.getInstanceFromEnv()); if (needMigrate) { - System.out.println("Found acl tables that need to migrate. Please execute command : ${KYLIN_HOME}/bin/kylin.sh org.apache.kylin.tool.AclTableMigrationCLI MIGRATE"); - System.exit(1); + System.out.println("Found ACL metadata in legacy format. Please execute command : ${KYLIN_HOME}/bin/kylin.sh org.apache.kylin.tool.AclTableMigrationCLI MIGRATE"); + System.exit(2); } break; default: