From 5cb7327f7b81f2e186dba7e23013c6cd21580fba Mon Sep 17 00:00:00 2001
From: wanglihui <949764788@qq.com>
Date: Tue, 13 Oct 2020 16:24:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81arangoDb=E6=95=85=E9=9A=9C?=
 =?UTF-8?q?=E8=BD=AC=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/ac/iie/utils/ArangoDBConnect.java | 17 +++++++++++++++--
 .../src/main/resources/application.properties | 19 +++++++++----------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/ip-learning-spark/src/main/java/cn/ac/iie/utils/ArangoDBConnect.java b/ip-learning-spark/src/main/java/cn/ac/iie/utils/ArangoDBConnect.java
index f6d3c5f..ac28054 100644
--- a/ip-learning-spark/src/main/java/cn/ac/iie/utils/ArangoDBConnect.java
+++ b/ip-learning-spark/src/main/java/cn/ac/iie/utils/ArangoDBConnect.java
@@ -27,14 +27,27 @@ public class ArangoDBConnect {
     }
 
     private static void getArangoDatabase(){
-        arangoDB = new ArangoDB.Builder()
+        ArangoDB.Builder host = getArangoHost();
+        arangoDB = host
                 .maxConnections(ApplicationConfig.THREAD_POOL_NUMBER())
-                .host(ApplicationConfig.ARANGODB_HOST(), ApplicationConfig.ARANGODB_PORT())
+                .acquireHostList(true)
                 .user(ApplicationConfig.ARANGODB_USER())
                 .password(ApplicationConfig.ARANGODB_PASSWORD())
                 .build();
     }
 
+    private static ArangoDB.Builder getArangoHost(){
+        String hostList = ApplicationConfig.ARANGODB_HOST();
+        String[] split = hostList.split(",");
+        ArangoDB.Builder host = new ArangoDB.Builder();
+        for (String hostStr : split) {
+            host.host(hostStr, ApplicationConfig.ARANGODB_PORT());
+            LOG.warn("arangoDB host {} 已添加",hostStr);
+        }
+        LOG.warn("获取arangoDB host成功");
+        return host;
+    }
+
     public static synchronized ArangoDBConnect getInstance(){
         if (null == conn){
             conn = new ArangoDBConnect();
diff --git a/ip-learning-spark/src/main/resources/application.properties b/ip-learning-spark/src/main/resources/application.properties
index 9a61792..8b4d2f5 100644
--- a/ip-learning-spark/src/main/resources/application.properties
+++ b/ip-learning-spark/src/main/resources/application.properties
@@ -3,11 +3,11 @@ spark.sql.shuffle.partitions=10
 spark.executor.memory=4g
 spark.app.name=test
 spark.network.timeout=300s
-repartitionNumber=36
 spark.serializer=org.apache.spark.serializer.KryoSerializer
+#spark.serializer=org.apache.spark.serializer.JavaSerializer
 master=local[*]
 #spark读取clickhouse配置
-spark.read.clickhouse.url=jdbc:clickhouse://192.168.44.12:8123/tsg_galaxy_v3
+spark.read.clickhouse.url=jdbc:clickhouse://192.168.44.10:8123/tsg_galaxy_v3
 spark.read.clickhouse.driver=ru.yandex.clickhouse.ClickHouseDriver
 spark.read.clickhouse.user=default
 spark.read.clickhouse.password=ceiec2019
@@ -16,21 +16,20 @@ spark.read.clickhouse.fetchsize=10000
 spark.read.clickhouse.partitionColumn=LAST_FOUND_TIME
 clickhouse.socket.timeout=300000
 #arangoDB配置
-arangoDB.host=192.168.40.182
+arangoDB.host=192.168.40.123,192.168.40.223,192.168.40.222
+#arangoDB.host=192.168.40.223
 arangoDB.port=8529
 arangoDB.user=upsert
-arangoDB.password=ceiec2018
-#arangoDB.DB.name=insert_iplearn_index
-arangoDB.DB.name=ip-learning-test-0
-#arangoDB.DB.name=ip-learning-test
+arangoDB.password=ceiec2019
+arangoDB.DB.name=tsg_galaxy_v3
 arangoDB.ttl=3600
 
 thread.pool.number=10
 
 #读取clickhouse时间范围方式，0：读取过去一小时；1：指定时间范围
-clickhouse.time.limit.type=0
-read.clickhouse.max.time=1600246160
-read.clickhouse.min.time=1597197469
+clickhouse.time.limit.type=1
+read.clickhouse.max.time=1600916194
+read.clickhouse.min.time=1599197648
 
 arangoDB.read.sepNum=10
 update.arango.batch=10000