You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/11/17 06:27:14 UTC
[1/2] incubator-kylin git commit: minor: fix log for streaming and
monitor routine in kylin.sh
Repository: incubator-kylin
Updated Branches:
refs/heads/2.x-staging b9a19110b -> 6ae2bfc48
minor: fix log for streaming and monitor routine in kylin.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/41ca5d2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/41ca5d2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/41ca5d2b
Branch: refs/heads/2.x-staging
Commit: 41ca5d2bd0503cb17517583d31c25a8bc2dcda14
Parents: b9a1911
Author: honma <ho...@ebay.com>
Authored: Tue Nov 17 11:28:20 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Tue Nov 17 11:28:20 2015 +0800
----------------------------------------------------------------------
build/bin/kylin.sh | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/41ca5d2b/build/bin/kylin.sh
----------------------------------------------------------------------
diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh
index 5a5ae54..b097ad0 100644
--- a/build/bin/kylin.sh
+++ b/build/bin/kylin.sh
@@ -107,11 +107,6 @@ then
fi
if [ $2 == "start" ]
then
- useSandbox=`sh ${dir}/get-properties.sh kylin.sandbox`
- spring_profile="default"
- if [ "$useSandbox" = "true" ]
- then spring_profile="sandbox"
- fi
#retrive $hive_dependency and $hbase_dependency
source ${dir}/find-hive-dependency.sh
@@ -126,11 +121,9 @@ then
# KYLIN_EXTRA_START_OPTS is for customized settings, checkout bin/setenv.sh
hbase ${KYLIN_EXTRA_START_OPTS} \
- -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
- -Dorg.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH=true \
+ -Dlog4j.configuration=kylin-log4j.properties\
-Dkylin.hive.dependency=${hive_dependency} \
-Dkylin.hbase.dependency=${hbase_dependency} \
- -Dspring.profiles.active=${spring_profile} \
org.apache.kylin.engine.streaming.cli.StreamingCLI $@ > ${KYLIN_HOME}/logs/streaming_$3_$4.log 2>&1 & echo $! > ${KYLIN_HOME}/logs/$3_$4 &
echo "streaming started name: $3 id: $4"
exit 0
@@ -160,13 +153,6 @@ then
elif [ $1 == "monitor" ]
then
echo "monitor job"
- tomcat_root=${dir}/../tomcat
- export tomcat_root
- useSandbox=`sh ${dir}/get-properties.sh kylin.sandbox`
- spring_profile="default"
- if [ "$useSandbox" = "true" ]
- then spring_profile="sandbox"
- fi
#retrive $hive_dependency and $hbase_dependency
source ${dir}/find-hive-dependency.sh
@@ -177,17 +163,13 @@ then
fi
mkdir -p ${KYLIN_HOME}/ext
- export HBASE_CLASSPATH_PREFIX=${tomcat_root}/bin/bootstrap.jar:${tomcat_root}/bin/tomcat-juli.jar:${tomcat_root}/lib/*:$HBASE_CLASSPATH_PREFIX
export HBASE_CLASSPATH=$hive_dependency:${KYLIN_HOME}/lib/*:${KYLIN_HOME}/ext/*:${HBASE_CLASSPATH}
# KYLIN_EXTRA_START_OPTS is for customized settings, checkout bin/setenv.sh
hbase ${KYLIN_EXTRA_START_OPTS} \
- -Djava.util.logging.config.file=${tomcat_root}/conf/logging.properties \
- -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
- -Dorg.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH=true \
+ -Dlog4j.configuration=kylin-log4j.properties\
-Dkylin.hive.dependency=${hive_dependency} \
-Dkylin.hbase.dependency=${hbase_dependency} \
- -Dspring.profiles.active=${spring_profile} \
org.apache.kylin.engine.streaming.cli.MonitorCLI $@ > ${KYLIN_HOME}/logs/monitor.log 2>&1
exit 0
[2/2] incubator-kylin git commit: minor: change kafka client config:
retry.backoff.ms from default to 1000ms
Posted by ma...@apache.org.
minor: change kafka client config: retry.backoff.ms from default to 1000ms
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/6ae2bfc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/6ae2bfc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/6ae2bfc4
Branch: refs/heads/2.x-staging
Commit: 6ae2bfc4875621832f54a115f497eb0a350f05ab
Parents: 41ca5d2
Author: honma <ho...@ebay.com>
Authored: Tue Nov 17 13:29:27 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Tue Nov 17 13:29:27 2015 +0800
----------------------------------------------------------------------
.../test/java/org/apache/kylin/job/streaming/KafkaDataLoader.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6ae2bfc4/assembly/src/test/java/org/apache/kylin/job/streaming/KafkaDataLoader.java
----------------------------------------------------------------------
diff --git a/assembly/src/test/java/org/apache/kylin/job/streaming/KafkaDataLoader.java b/assembly/src/test/java/org/apache/kylin/job/streaming/KafkaDataLoader.java
index c3caa9b..27e3897 100644
--- a/assembly/src/test/java/org/apache/kylin/job/streaming/KafkaDataLoader.java
+++ b/assembly/src/test/java/org/apache/kylin/job/streaming/KafkaDataLoader.java
@@ -36,6 +36,7 @@ public class KafkaDataLoader {
props.put("metadata.broker.list", brokerList);
props.put("serializer.class", "kafka.serializer.StringEncoder");
props.put("request.required.acks", "1");
+ props.put("retry.backoff.ms",1000);
ProducerConfig config = new ProducerConfig(props);