Merge branch 'dev' into dev

5 years ago · a2b4b36cc7
3 changed files with 7 additions and 7 deletions
--- 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>
--- 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
+#zookeeper.retry.maxtime=10
--- 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
+#zookeeper.retry.maxtime=10