From 2f5427ca33b8e929d58412699699141191c640b4 Mon Sep 17 00:00:00 2001
From: Kevin <kevin.d.jiang@foxmail.com>
Date: Wed, 22 Apr 2020 20:14:13 +0800
Subject: [PATCH] reset default zookeeper parameter #2494 (#2495)

* reset default zookeeper parameter

* fix install.sh zookeeper.properties

Co-authored-by: dailidong <dailidong66@gmail.com>
---
 .../DOLPHIN/1.2.1/configuration/dolphin-common.xml          | 4 ++--
 dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl   | 6 +++---
 .../src/main/resources/zookeeper.properties                 | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ambari_plugin/common-services/DOLPHIN/1.2.1/configuration/dolphin-common.xml b/ambari_plugin/common-services/DOLPHIN/1.2.1/configuration/dolphin-common.xml
index 41e2836e37..7d4fb8329b 100644
--- a/ambari_plugin/common-services/DOLPHIN/1.2.1/configuration/dolphin-common.xml
+++ b/ambari_plugin/common-services/DOLPHIN/1.2.1/configuration/dolphin-common.xml
@@ -43,7 +43,7 @@
     </property>
     <property>
         <name>zookeeper.connection.timeout</name>
-        <value>300</value>
+        <value>30000</value>
         <value-attributes>
             <type>int</type>
         </value-attributes>
@@ -73,7 +73,7 @@
     </property>
     <property>
         <name>zookeeper.retry.maxtime</name>
-        <value>5</value>
+        <value>10</value>
         <value-attributes>
             <type>int</type>
         </value-attributes>
diff --git a/dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl b/dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl
index a0ef72dc8f..362a4e85ad 100644
--- a/dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl
+++ b/dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl
@@ -22,8 +22,8 @@ zookeeper.quorum=${ZOOKEEPER_QUORUM}
 #zookeeper.dolphinscheduler.root=/dolphinscheduler
 
 # dolphinscheduler failover directory
-#zookeeper.session.timeout=300
-#zookeeper.connection.timeout=300
+#zookeeper.session.timeout=60000
+#zookeeper.connection.timeout=30000
 #zookeeper.retry.base.sleep=100
 #zookeeper.retry.max.sleep=30000
-#zookeeper.retry.maxtime=5
\ No newline at end of file
+#zookeeper.retry.maxtime=10
\ No newline at end of file
diff --git a/dolphinscheduler-service/src/main/resources/zookeeper.properties b/dolphinscheduler-service/src/main/resources/zookeeper.properties
index a0df570d47..2204467ac9 100644
--- a/dolphinscheduler-service/src/main/resources/zookeeper.properties
+++ b/dolphinscheduler-service/src/main/resources/zookeeper.properties
@@ -23,7 +23,7 @@ zookeeper.quorum=localhost:2181
 
 # dolphinscheduler failover directory
 #zookeeper.session.timeout=60000
-#zookeeper.connection.timeout=300
+#zookeeper.connection.timeout=30000
 #zookeeper.retry.base.sleep=100
 #zookeeper.retry.max.sleep=30000
-#zookeeper.retry.maxtime=5
\ No newline at end of file
+#zookeeper.retry.maxtime=10
\ No newline at end of file