This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 2f5427c reset default zookeeper parameter #2494 (#2495)
2f5427c is described below
commit 2f5427ca33b8e929d58412699699141191c640b4
Author: Kevin <[email protected]>
AuthorDate: Wed Apr 22 20:14:13 2020 +0800
reset default zookeeper parameter #2494 (#2495)
* reset default zookeeper parameter
* fix install.sh zookeeper.properties
Co-authored-by: dailidong <[email protected]>
---
.../common-services/DOLPHIN/1.2.1/configuration/dolphin-common.xml | 4 ++--
dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl | 6 +++---
dolphinscheduler-service/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 41e2836..7d4fb83 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 a0ef72d..362a4e8 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 a0df570..2204467 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