Unverified Commit a2b4b36c authored by dailidong's avatar dailidong Committed by GitHub
Browse files

Merge branch 'dev' into dev

parents 53c3b6fa 2f5427ca

ambari_plugin/common-services/DOLPHIN/1.2.1/configuration/dolphin-common.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl

+3 −3
Original line number Diff line number Diff line
@@ -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

dolphinscheduler-service/src/main/resources/zookeeper.properties

+2 −2
Original line number Diff line number Diff line
@@ -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