This is an automated email from the ASF dual-hosted git repository. xxyu pushed a commit to branch kylin-on-parquet-v2 in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 5f16a065ace55d884532cf7d5ad867d94804a39c Author: XiaoxiangYu <x...@apache.org> AuthorDate: Tue Oct 27 19:40:23 2020 +0800 KYLIN-4775 Fix 0.0.0.0:10020 ConnectionRefused --- docker/docker-compose/others/client-write-read.env | 4 ++-- docker/docker-compose/others/client-write.env | 1 + docker/docker-compose/write/docker-compose-hadoop.yml | 3 +++ docker/docker-compose/write/write-hadoop.env | 1 + docker/dockerfile/cluster/client/conf/hadoop-write/yarn-site.xml | 1 + docker/dockerfile/cluster/historyserver/Dockerfile | 1 + docker/dockerfile/cluster/historyserver/run_history.sh | 7 ++++++- 7 files changed, 15 insertions(+), 3 deletions(-) diff --git a/docker/docker-compose/others/client-write-read.env b/docker/docker-compose/others/client-write-read.env index 1a9ecad..3e5bc54 100644 --- a/docker/docker-compose/others/client-write-read.env +++ b/docker/docker-compose/others/client-write-read.env @@ -31,6 +31,7 @@ YARN_CONF_yarn_nodemanager_resource_cpu___vcores=6 YARN_CONF_yarn_nodemanager_disk___health___checker_max___disk___utilization___per___disk___percentage=98.5 YARN_CONF_yarn_nodemanager_remote___app___log___dir=/app-logs YARN_CONF_yarn_nodemanager_aux___services=mapreduce_shuffle +YARN_CONF_mapreduce_jobhistory_address=write-historyserver:10020 MAPRED_CONF_mapreduce_framework_name=yarn MAPRED_CONF_mapred_child_java_opts=-Xmx4096m @@ -57,5 +58,4 @@ HBASE_CONF_hbase_master_info_port=16010 HBASE_CONF_hbase_regionserver_port=16020 HBASE_CONF_hbase_regionserver_info_port=16030 -HBASE_MANAGES_ZK=false - +HBASE_MANAGES_ZK=false \ No newline at end of file diff --git a/docker/docker-compose/others/client-write.env b/docker/docker-compose/others/client-write.env index d47815c..aec9d02 100644 --- a/docker/docker-compose/others/client-write.env +++ b/docker/docker-compose/others/client-write.env @@ -31,6 +31,7 @@ YARN_CONF_yarn_nodemanager_resource_cpu___vcores=6 YARN_CONF_yarn_nodemanager_disk___health___checker_max___disk___utilization___per___disk___percentage=98.5 YARN_CONF_yarn_nodemanager_remote___app___log___dir=/app-logs YARN_CONF_yarn_nodemanager_aux___services=mapreduce_shuffle +YARN_CONF_mapreduce_jobhistory_address=write-historyserver:10020 MAPRED_CONF_mapreduce_framework_name=yarn MAPRED_CONF_mapred_child_java_opts=-Xmx4096m diff --git a/docker/docker-compose/write/docker-compose-hadoop.yml b/docker/docker-compose/write/docker-compose-hadoop.yml index 8c75f37..47f54ec 100644 --- a/docker/docker-compose/write/docker-compose-hadoop.yml +++ b/docker/docker-compose/write/docker-compose-hadoop.yml @@ -125,6 +125,9 @@ services: - kylin ports: - 8188:8188 + - 10020:10020 + expose: + - 10020 networks: kylin: \ No newline at end of file diff --git a/docker/docker-compose/write/write-hadoop.env b/docker/docker-compose/write/write-hadoop.env index 670756f..a99c096 100644 --- a/docker/docker-compose/write/write-hadoop.env +++ b/docker/docker-compose/write/write-hadoop.env @@ -31,6 +31,7 @@ YARN_CONF_yarn_nodemanager_resource_cpu___vcores=6 YARN_CONF_yarn_nodemanager_disk___health___checker_max___disk___utilization___per___disk___percentage=98.5 YARN_CONF_yarn_nodemanager_remote___app___log___dir=/app-logs YARN_CONF_yarn_nodemanager_aux___services=mapreduce_shuffle +YARN_CONF_mapreduce_jobhistory_address=write-historyserver:10020 MAPRED_CONF_mapreduce_framework_name=yarn MAPRED_CONF_mapred_child_java_opts=-Xmx4096m diff --git a/docker/dockerfile/cluster/client/conf/hadoop-write/yarn-site.xml b/docker/dockerfile/cluster/client/conf/hadoop-write/yarn-site.xml index b55dd34..a60385a 100644 --- a/docker/dockerfile/cluster/client/conf/hadoop-write/yarn-site.xml +++ b/docker/dockerfile/cluster/client/conf/hadoop-write/yarn-site.xml @@ -33,6 +33,7 @@ <property><name>yarn.timeline-service.hostname</name><value>write-historyserver</value></property> <property><name>yarn.scheduler.capacity.root.default.maximum-allocation-mb</name><value>8192</value></property> <property><name>yarn.log.server.url</name><value>http://write-historyserver:8188/applicationhistory/logs/</value></property> +<property><name>mapreduce.jobhistory.address</name><value>write-historyserver:10020</value></property> <property><name>yarn.resourcemanager.scheduler.class</name><value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value></property> <property><name>yarn.resourcemanager.scheduler.address</name><value>write-resourcemanager:8030</value></property> <property><name>yarn.resourcemanager.address</name><value>write-resourcemanager:8032</value></property> diff --git a/docker/dockerfile/cluster/historyserver/Dockerfile b/docker/dockerfile/cluster/historyserver/Dockerfile index 7c89d00..c6f3496 100644 --- a/docker/dockerfile/cluster/historyserver/Dockerfile +++ b/docker/dockerfile/cluster/historyserver/Dockerfile @@ -21,6 +21,7 @@ FROM apachekylin/kylin-ci-hadoop-base:hadoop_${HADOOP_VERSION} ARG HADOOP_HISTORY_PORT=8188 ENV HADOOP_HISTORY_PORT ${HADOOP_HISTORY_PORT} EXPOSE ${HADOOP_HISTORY_PORT} +EXPOSE 10020 HEALTHCHECK CMD curl -f http://localhost:${HADOOP_HISTORY_PORT}/ || exit 1 diff --git a/docker/dockerfile/cluster/historyserver/run_history.sh b/docker/dockerfile/cluster/historyserver/run_history.sh index 6d7ae4e..47745b1 100644 --- a/docker/dockerfile/cluster/historyserver/run_history.sh +++ b/docker/dockerfile/cluster/historyserver/run_history.sh @@ -17,4 +17,9 @@ # limitations under the License. # -$HADOOP_PREFIX/bin/yarn --config $HADOOP_CONF_DIR historyserver +#$HADOOP_PREFIX/bin/yarn --config $HADOOP_CONF_DIR historyserver +$HADOOP_PREFIX/sbin/mr-jobhistory-daemon.sh --config $HADOOP_CONF_DIR start historyserver +while : +do + sleep 100 +done \ No newline at end of file