ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [28/30] ambari git commit: AMBARI-18663. Storm becomes stopped by itself after upgrade from 2.2.1.0 to 2.4.1.0 (dlysnichenko)
Date Fri, 21 Oct 2016 17:20:16 GMT
AMBARI-18663. Storm becomes stopped by itself after upgrade from 2.2.1.0 to 2.4.1.0 (dlysnichenko)

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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3b159d27
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3b159d27
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3b159d27

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 3b159d27290a31df3c2269df1d0f6152d0dff780
Parents: 942b3db
Author: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Authored: Fri Oct 21 19:30:19 2016 +0300
Committer: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Committed: Fri Oct 21 19:38:15 2016 +0300

----------------------------------------------------------------------
 .../server/state/stack/upgrade/ConfigureTask.java    |  2 +-
 .../STORM/0.9.1/configuration/storm-site.xml         |  2 +-
 .../services/STORM/configuration/storm-site.xml      |  4 ++--
 .../stacks/HDP/2.2/upgrades/config-upgrade.xml       | 14 ++++++++++++++
 .../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml      |  4 ++++
 .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml      |  4 ++++
 .../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml      |  4 ++++
 .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml          |  3 +++
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml          |  2 ++
 .../stacks/HDP/2.2/upgrades/upgrade-2.4.xml          |  2 ++
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml       | 14 ++++++++++++++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml      |  4 ++++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml      |  5 +++++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml      |  4 ++++
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml          |  2 ++
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml          |  2 ++
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml          |  2 ++
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml       | 15 +++++++++++++++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml      |  4 ++++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml      |  4 ++++
 .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml          |  2 ++
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml          |  1 +
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml       | 14 ++++++++++++++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml      |  5 +++++
 .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml          |  2 ++
 25 files changed, 117 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java
index 343c484..a9b355a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java
@@ -298,7 +298,7 @@ public class ConfigureTask extends ServerSideActionTask {
 
   /**
    * Sanity check for invalid attribute settings on if-key, if-value, if-key-state, if-site
-   * Regardless whether it's set, transfrer, or replace, the condition attributres are the
same
+   * Regardless whether it's set, transfer, or replace, the condition attributes are the
same
    * So the same logic can be used to determine if the operation is allowed or not.
    * */
   private boolean isValidConditionSettings(Cluster cluster, String configType, String targetPropertyKey,

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-site.xml
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-site.xml
index e504c2d..d830ace 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-site.xml
@@ -79,7 +79,7 @@
   </property>
   <property>
     <name>storm.zookeeper.connection.timeout</name>
-    <value>15000</value>
+    <value>30000</value>
     <description>The connection timeout for clients to ZooKeeper.</description>
     <value-attributes>
       <type>int</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/configuration/storm-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/configuration/storm-site.xml
index 3ec48db..e089ae0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/configuration/storm-site.xml
@@ -57,13 +57,13 @@
   </property>
   <property>
     <name>storm.zookeeper.session.timeout</name>
-    <value>20000</value>
+    <value>30000</value>
     <description>The session timeout for clients to ZooKeeper.</description>
     <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>storm.zookeeper.connection.timeout</name>
-    <value>15000</value>
+    <value>30000</value>
     <description>The connection timeout for clients to ZooKeeper.</description>
     <on-ambari-upgrade add="true"/>
   </property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
index 2d336ba..c225cca 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
@@ -598,6 +598,20 @@
             <transfer operation="delete" delete-key="storm.topology.submission.notifier.plugin.class"
if-key="storm.topology.submission.notifier.plugin.class"
                       if-type="storm-site" if-value=" "/>
           </definition>
+          <definition xsi:type="configure" id="increase_storm_zookeeper_timeouts"
+                      summary="Increase storm.zookeeper.session.timeout and storm.zookeeper.connection.timeout
property">
+            <type>storm-site</type>
+            <set key="storm.zookeeper.session.timeout"
+                 value="30000"
+                 if-key="storm.zookeeper.session.timeout"
+                 if-type="storm-site"
+                 if-value="20000" />
+            <set key="storm.zookeeper.connection.timeout"
+                 value="30000"
+                 if-key="storm.zookeeper.connection.timeout"
+                 if-type="storm-site"
+                 if-value="15000" />
+          </definition>
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
index d282888..87afdbc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
@@ -242,6 +242,10 @@
           <summary>Adjusting Oozie properties</summary>
         </task>
       </execute-stage>
+
+      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Nimbus">
+        <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
+      </execute-stage>
     </group>
 
     <!--

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
index 391524a..e082f72 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
@@ -530,6 +530,10 @@
       <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Nimbus">
         <task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
       </execute-stage>
+
+      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Nimbus">
+        <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
+      </execute-stage>
     </group>
 
     <!--

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml
index 27a41f4..ed81582 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml
@@ -553,6 +553,10 @@
         <task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
       </execute-stage>
 
+      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Nimbus">
+        <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
+      </execute-stage>
+
     </group>
 
     <!--

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
index 586d04a..3cc0a65 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
@@ -668,6 +668,9 @@
           <task xsi:type="manual">
             <message>Before continuing, please deactivate and kill any currently running
topologies.</message>
           </task>
+
+          <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
+
         </pre-upgrade>
         <upgrade>
           <task xsi:type="restart-task"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
index d1ba1c2..e8e00f0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
@@ -914,6 +914,8 @@
           <task xsi:type="configure" id="hdp_2_3_0_0_nimbus_remove_deprecated_ranger_properties"/>
 
           <task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
+
+          <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
         </pre-upgrade>
 
         <pre-downgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml
index 09fa146..790e5dc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml
@@ -922,6 +922,8 @@
           <task xsi:type="configure" id="hdp_2_3_0_0_nimbus_remove_deprecated_ranger_properties"/>
 
           <task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
+
+          <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
         </pre-upgrade>
 
         <pre-downgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index e0a95da..7d80a63 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -442,6 +442,20 @@
             <type>storm-site</type>
             <transfer operation="delete" delete-key="atlas.cluster.name" />
           </definition>
+          <definition xsi:type="configure" id="increase_storm_zookeeper_timeouts"
+                      summary="Increase storm.zookeeper.session.timeout and storm.zookeeper.connection.timeout
property">
+            <type>storm-site</type>
+            <set key="storm.zookeeper.session.timeout"
+                 value="30000"
+                 if-key="storm.zookeeper.session.timeout"
+                 if-type="storm-site"
+                 if-value="20000" />
+            <set key="storm.zookeeper.connection.timeout"
+                 value="30000"
+                 if-key="storm.zookeeper.connection.timeout"
+                 if-type="storm-site"
+                 if-value="15000" />
+          </definition>
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
index d3b2696..01e0601 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
@@ -285,6 +285,10 @@
         <task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
       </execute-stage>
 
+      <!--STORM-->
+      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Nimbus">
+        <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
+      </execute-stage>
     </group>
 
     <!--

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
index 38c8796..2925b64 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
@@ -333,9 +333,14 @@
         <task xsi:type="configure" id="hdp_2_4_0_0_spark_java_opts"/>
       </execute-stage>
 
+      <!-- STORM -->
       <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Nimbus">
         <task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
       </execute-stage>
+
+      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Nimbus">
+        <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
+      </execute-stage>
     </group>
 
     <!--

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
index c8b1e8c..266c71b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
@@ -458,6 +458,10 @@
       <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Nimbus">
         <task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
       </execute-stage>
+
+      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Nimbus">
+        <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
+      </execute-stage>
     </group>
 
     <!--

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
index 0b326a7..8b00893 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
@@ -808,6 +808,8 @@
       <component name="NIMBUS">
         <pre-upgrade>
           <task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
+
+          <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
         </pre-upgrade>
 
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
index a5c243f..6cc1106 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
@@ -892,6 +892,8 @@
       <component name="NIMBUS">
         <pre-upgrade>
           <task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
+
+          <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
         </pre-upgrade>
 
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
index f9012e7..b0b78a0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
@@ -1030,6 +1030,8 @@
 
           <task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
 
+          <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
+
           <task xsi:type="execute" hosts="any">
             <summary>Removing Storm data from ZooKeeper</summary>
             <script>scripts/storm_upgrade.py</script>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
index 898150d..ecf324c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
@@ -296,6 +296,21 @@
             <type>storm-site</type>
             <transfer operation="delete" delete-key="atlas.cluster.name" />
           </definition>
+
+          <definition xsi:type="configure" id="increase_storm_zookeeper_timeouts"
+                      summary="Increase storm.zookeeper.session.timeout and storm.zookeeper.connection.timeout
property">
+            <type>storm-site</type>
+            <set key="storm.zookeeper.session.timeout"
+                 value="30000"
+                 if-key="storm.zookeeper.session.timeout"
+                 if-type="storm-site"
+                 if-value="20000" />
+            <set key="storm.zookeeper.connection.timeout"
+                 value="30000"
+                 if-key="storm.zookeeper.connection.timeout"
+                 if-type="storm-site"
+                 if-value="15000" />
+          </definition>
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
index b5c5c03..d1e1059 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
@@ -278,6 +278,10 @@
       <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Nimbus">
         <task xsi:type="configure" id="hdp_2_4_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
       </execute-stage>
+
+      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Nimbus">
+        <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
+      </execute-stage>
     </group>
 
     <!--

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
index 0a14581..9021761 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
@@ -399,6 +399,10 @@
         <task xsi:type="configure" id="hdp_2_4_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
       </execute-stage>
 
+      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Nimbus">
+        <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
+      </execute-stage>
+
       <!-- KAFKA -->
       <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply config changes
for Kafka Broker">
         <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
index 5b53c86..390f18e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
@@ -790,6 +790,8 @@
       <component name="NIMBUS">
         <pre-upgrade>
           <task xsi:type="configure" id="hdp_2_4_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
+
+          <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
         </pre-upgrade>
 
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
index f6a17eb..6af7767 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
@@ -995,6 +995,7 @@
           </task>
           <task xsi:type="configure" id="hdp_2_5_0_0_add_storm_security_configs" />
           <task xsi:type="configure" id="hdp_2_4_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
+          <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
         </pre-upgrade>
 
         <pre-downgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 065f30f..59e4ec5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -28,6 +28,20 @@
             <transfer operation="delete" delete-key="storm.topology.submission.notifier.plugin.class"
if-key="storm.topology.submission.notifier.plugin.class"
                       if-type="storm-site" if-value=" "/>
           </definition>
+          <definition xsi:type="configure" id="increase_storm_zookeeper_timeouts"
+                      summary="Increase storm.zookeeper.session.timeout and storm.zookeeper.connection.timeout
property">
+            <type>storm-site</type>
+            <set key="storm.zookeeper.session.timeout"
+                 value="30000"
+                 if-key="storm.zookeeper.session.timeout"
+                 if-type="storm-site"
+                 if-value="20000" />
+            <set key="storm.zookeeper.connection.timeout"
+                 value="30000"
+                 if-key="storm.zookeeper.connection.timeout"
+                 if-type="storm-site"
+                 if-value="15000" />
+          </definition>
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
index 1df16a2..5e3561a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
@@ -294,9 +294,14 @@
         </task>
       </execute-stage>
 
+      <!-- STORM -->
       <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Storm">
         <task xsi:type="configure" id="hdp_2_5_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
       </execute-stage>
+
+      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Nimbus">
+        <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
+      </execute-stage>
     </group>
 
     <!--

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b159d27/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
index 2932b6c..b02cbad 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
@@ -860,6 +860,8 @@
       <component name="NIMBUS">
         <pre-upgrade>
           <task xsi:type="configure" id="hdp_2_5_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
+
+          <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
         </pre-upgrade>
 
         <upgrade>


Mime
View raw message