You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2016/10/21 16:52:56 UTC
[2/2] ambari git commit: AMBARI-18663. Storm becomes stopped by
itself after upgrade from 2.2.1.0 to 2.4.1.0 (dlysnichenko)
AMBARI-18663. Storm becomes stopped by itself after upgrade from 2.2.1.0 to 2.4.1.0 (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a36a78f4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a36a78f4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a36a78f4
Branch: refs/heads/branch-2.4
Commit: a36a78f418f50400eedb07781143e7cbd51da5ce
Parents: 32565cd
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Oct 21 19:30:19 2016 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Oct 21 19:47:02 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/a36a78f4/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/a36a78f4/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/a36a78f4/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/a36a78f4/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 5957da4..0f5f48e 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
@@ -650,6 +650,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/a36a78f4/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 d0bfec2..46f0fee 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
@@ -237,6 +237,10 @@
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
<task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
</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/a36a78f4/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 3168f10..a741722 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
@@ -521,6 +521,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/a36a78f4/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 0f15286..933183b 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
@@ -543,6 +543,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/a36a78f4/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 9f0f421..facb253 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
@@ -682,6 +682,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/a36a78f4/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 41b516a..232d456 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
@@ -915,6 +915,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>
<upgrade>
<task xsi:type="restart-task"/>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a36a78f4/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 4a704ad..580fcc0 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
@@ -927,6 +927,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>
<upgrade>
<task xsi:type="restart-task"/>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a36a78f4/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 b63115b..1d1b067 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
@@ -531,6 +531,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/a36a78f4/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 b7465f7..90f62dc 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
@@ -280,6 +280,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/a36a78f4/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 eb6f333..ecfc4d7 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
@@ -324,9 +324,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/a36a78f4/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 ff4ed18..68fb1d4 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
@@ -446,6 +446,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/a36a78f4/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 533a1e9..e15f399 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
@@ -817,6 +817,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/a36a78f4/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 5ac0540..f1a64c5e 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
@@ -889,6 +889,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/a36a78f4/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 8ecd90f..025e11a 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
@@ -1021,6 +1021,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">
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a36a78f4/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 8a9996c..c62ded4 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
@@ -333,6 +333,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/a36a78f4/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 750f934..2e5c60e 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
@@ -274,6 +274,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/a36a78f4/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 2924455..4e49097 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
@@ -394,6 +394,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/a36a78f4/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 abf2db3..19019d8 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
@@ -800,6 +800,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/a36a78f4/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 e4f56e9..0b89b01 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
@@ -996,6 +996,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/a36a78f4/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 962d92e..5d9dc8a 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
@@ -59,6 +59,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/a36a78f4/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 a54c830..3107bf3 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
@@ -289,9 +289,14 @@
<task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
</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/a36a78f4/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 e3e632b..e013a27 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
@@ -870,6 +870,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>