AMBARI-20505 : Changes needed to handle AMBARI-19623 in EU/RU scenario (Vishal Suvagia via mugdha)

ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml

@@ -112,6 +112,13 @@
             <type>application-properties</type>
             <set key="atlas.ssl.exclude.protocols" value="TLSv1.2" if-type="application-properties" if-key="atlas.ssl.exclude.protocols" if-key-state="absent"/>
           </definition>
+
+          <definition xsi:type="configure" id="increase_atlas_zookeeper_timeouts" summary="Updating Atlas zookeeper timeout values">
+            <type>application-properties</type>
+            <set key="atlas.kafka.zookeeper.connection.timeout.ms" value="30000" if-type="application-properties" if-key="atlas.kafka.zookeeper.connection.timeout.ms" if-key-state="present"/>
+            <set key="atlas.kafka.zookeeper.session.timeout.ms" value="60000" if-type="application-properties" if-key="atlas.kafka.zookeeper.session.timeout.ms" if-key-state="present"/>
+            <set key="atlas.audit.zookeeper.session.timeout.ms" value="60000" if-type="application-properties" if-key="atlas.audit.zookeeper.session.timeout.ms" if-key-state="present"/>
+          </definition>
         </changes>
       </component>
       <component name="SPARK_CLIENT">

ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml

@@ -312,6 +312,12 @@
           <summary>Updating Atlas TLS Exclude Protocols to exclude TLS v1.2</summary>
         </task>
       </execute-stage>
+
+      <execute-stage service="ATLAS" component="ATLAS_SERVER" title="Updating Atlas zookeeper timeout values">
+        <task xsi:type="configure" id="increase_atlas_zookeeper_timeouts">
+          <summary>Updating Atlas zookeeper timeout values</summary>
+        </task>
+      </execute-stage>
     </group>
 
     <!--

ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml

@@ -456,6 +456,12 @@
         </task>
       </execute-stage>
 
+      <execute-stage service="ATLAS" component="ATLAS_SERVER" title="Updating Atlas zookeeper timeout values">
+        <task xsi:type="configure" id="increase_atlas_zookeeper_timeouts">
+          <summary>Updating Atlas zookeeper timeout values</summary>
+        </task>
+      </execute-stage>
+
       <!--KAFKA-->
       <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Parameterizing Kafka Log4J Properties">
         <task xsi:type="configure" id="kafka_log4j_parameterize">

ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml

@@ -952,6 +952,7 @@
       <component name="ATLAS_SERVER">
         <pre-upgrade>
           <task xsi:type="configure" id="hdp_2_5_4_0_atlas_exclude_tls_protocol"/>
+          <task xsi:type="configure" id="increase_atlas_zookeeper_timeouts"/>
         </pre-upgrade>
         
         <pre-downgrade/>

ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml

@@ -1093,6 +1093,7 @@
         <pre-upgrade>
           <task xsi:type="configure" id="atlas_log4j_parameterize" />
           <task xsi:type="configure" id="hdp_2_5_4_0_atlas_exclude_tls_protocol"/>
+          <task xsi:type="configure" id="increase_atlas_zookeeper_timeouts"/>
         </pre-upgrade>
         <pre-downgrade />
         <upgrade>