Revert "KYLIN-1818 change kafka dependency to provided" This reverts commit 4e060e7bc89f757a138dfa5beba2a43209e91371.
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/dee8f2d0 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/dee8f2d0 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/dee8f2d0 Branch: refs/heads/1.5.x-HBase1.x Commit: dee8f2d073d225a3b8189c66170fd310c1a8d221 Parents: 355e58b Author: Hongbin Ma <mahong...@apache.org> Authored: Mon Sep 19 23:50:37 2016 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Tue Sep 20 11:43:08 2016 +0800 ---------------------------------------------------------------------- build/bin/find-kafka-dependency.sh | 12 ++++++------ build/bin/kylin.sh | 2 -- .../kylin/engine/mr/common/AbstractHadoopJob.java | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/dee8f2d0/build/bin/find-kafka-dependency.sh ---------------------------------------------------------------------- diff --git a/build/bin/find-kafka-dependency.sh b/build/bin/find-kafka-dependency.sh index 7349360..c6b9c24 100644 --- a/build/bin/find-kafka-dependency.sh +++ b/build/bin/find-kafka-dependency.sh @@ -32,20 +32,20 @@ then fi # works for kafka 9+ -kafka_dependency=`find -L $kafka_home -name 'kafka-clients-[a-z0-9A-Z\.-]*.jar' ! -name '*doc*' ! -name '*test*' ! -name '*sources*' ''-printf '%p:' | sed 's/:$//'` -if [ -z "$kafka_dependency" ] +kafka_client=`find -L "$(dirname $kafka_home)" -name 'kafka-clients-[a-z0-9A-Z\.-]*.jar' ! -name '*doc*' ! -name '*test*' ! -name '*sources*' ''-printf '%p:' | sed 's/:$//'` +if [ -z "$kafka_client" ] then # works for kafka 8 - kafka_dependency=`find -L $kafka_home -name 'kafka_[a-z0-9A-Z\.-]*.jar' ! -name '*doc*' ! -name '*test*' ! -name '*sources*' ''-printf '%p:' | sed 's/:$//'` - if [ -z "$kafka_dependency" ] + kafka_broker=`find -L "$(dirname $kafka_home)" -name 'kafka_[a-z0-9A-Z\.-]*.jar' ! -name '*doc*' ! -name '*test*' ! -name '*sources*' ''-printf '%p:' | sed 's/:$//'` + if [ -z "$kafka_broker" ] then echo "kafka client lib not found" exit 1 else - echo "kafka dependency: $kafka_dependency" + echo "kafka dependency: $kafka_broker" export kafka_dependency fi else - echo "kafka dependency: $kafka_dependency" + echo "kafka dependency: $kafka_client" export kafka_dependency fi http://git-wip-us.apache.org/repos/asf/kylin/blob/dee8f2d0/build/bin/kylin.sh ---------------------------------------------------------------------- diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh index 7a9d2a1..201b5b6 100644 --- a/build/bin/kylin.sh +++ b/build/bin/kylin.sh @@ -31,7 +31,6 @@ function retrieveDependency() { #retrive $hive_dependency and $hbase_dependency source ${dir}/find-hive-dependency.sh source ${dir}/find-hbase-dependency.sh - source ${dir}/find-kafka-dependency.sh #retrive $KYLIN_EXTRA_START_OPTS if [ -f "${dir}/setenv.sh" ] @@ -107,7 +106,6 @@ then -Djava.io.tmpdir=${tomcat_root}/temp \ -Dkylin.hive.dependency=${hive_dependency} \ -Dkylin.hbase.dependency=${hbase_dependency} \ - -Dkylin.kafka.dependency=${kafka_dependency} \ -Dkylin.rest.address=${kylin_rest_address} \ -Dspring.profiles.active=${spring_profile} \ org.apache.hadoop.util.RunJar ${tomcat_root}/bin/bootstrap.jar org.apache.catalina.startup.Bootstrap start >> ${KYLIN_HOME}/logs/kylin.out 2>&1 & echo $! > ${KYLIN_HOME}/pid & http://git-wip-us.apache.org/repos/asf/kylin/blob/dee8f2d0/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 a138eec..af2ed9f 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 @@ -226,11 +226,11 @@ public abstract class AbstractHadoopJob extends Configured implements Tool { } } - // for kafka dependencies + // for hive dependencies if (kylinKafkaDependency != null) { kylinKafkaDependency = kylinKafkaDependency.replace(":", ","); - logger.info("Kafka Dependencies Before Filtered: " + kylinKafkaDependency); + logger.info("Kafka Dependencies Before Filtered: " + kylinHiveDependency); if (kylinDependency.length() > 0) kylinDependency.append(",");
