From 9199da136823a02398742a0935308c957bc2948c Mon Sep 17 00:00:00 2001 From: Lionel Liu Date: Mon, 3 Sep 2018 14:10:28 +0800 Subject: [PATCH 1/3] update docker document for zookeeper image unaccessable in china --- griffin-doc/docker/griffin-docker-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/griffin-doc/docker/griffin-docker-guide.md b/griffin-doc/docker/griffin-docker-guide.md index c9fe15011..6ac377580 100644 --- a/griffin-doc/docker/griffin-docker-guide.md +++ b/griffin-doc/docker/griffin-docker-guide.md @@ -45,7 +45,7 @@ Griffin docker images are pre-built on docker hub, users can pull them to try gr docker pull registry.docker-cn.com/apachegriffin/griffin_spark2:0.3.0 docker pull registry.docker-cn.com/apachegriffin/elasticsearch docker pull registry.docker-cn.com/apachegriffin/kafka - docker pull registry.docker-cn.com/zookeeper:3.5 + docker pull zookeeper:3.5 ``` The docker images are the griffin environment images. - `apachegriffin/griffin_spark2`: This image contains mysql, hadoop, hive, spark, livy, griffin service, griffin measure, and some prepared demo data, it works as a single node spark cluster, providing spark engine and griffin service. From c90d246a5b452610d543a58a34d61c42d6da7dba Mon Sep 17 00:00:00 2001 From: Lionel Liu Date: Wed, 5 Sep 2018 13:58:45 +0800 Subject: [PATCH 2/3] update banner --- service/src/main/resources/banner.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/src/main/resources/banner.txt b/service/src/main/resources/banner.txt index fa2c8c0d7..1546074f2 100644 --- a/service/src/main/resources/banner.txt +++ b/service/src/main/resources/banner.txt @@ -2,4 +2,4 @@ _________________ _________________________________________ __ __ ____/___ __ \____ _/___ ____/___ ____/____ _/___ | / / _ / __ __ /_/ / __ / __ /_ __ /_ __ / __ |/ / / /_/ / _ _, _/ __/ / _ __/ _ __/ __/ / _ /| / -\____/ /_/ |_| /___/ /_/ /_/ /___/ /_/ |_/ version: 0.2.0 +\____/ /_/ |_| /___/ /_/ /_/ /___/ /_/ |_/ version: 0.3.0 From 52019103c363974f5020fff8afcbfbe5dc0cddcb Mon Sep 17 00:00:00 2001 From: Lionel Liu Date: Fri, 7 Sep 2018 10:12:43 +0800 Subject: [PATCH 3/3] set num of executors to 2 --- service/src/main/resources/sparkProperties.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/src/main/resources/sparkProperties.json b/service/src/main/resources/sparkProperties.json index 15c015d63..8fb023c98 100644 --- a/service/src/main/resources/sparkProperties.json +++ b/service/src/main/resources/sparkProperties.json @@ -3,7 +3,7 @@ "className": "org.apache.griffin.measure.Application", "name": "griffin", "queue": "default", - "numExecutors": 3, + "numExecutors": 2, "executorCores": 1, "driverMemory": "1g", "executorMemory": "1g",