You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mu...@apache.org on 2017/04/12 05:30:18 UTC
ambari git commit: AMBARI-20505 : Changes needed to handle
AMBARI-19623 in EU/RU scenario (Vishal Suvagia via mugdha)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 7643475cd -> 1b75e371d
AMBARI-20505 : Changes needed to handle AMBARI-19623 in EU/RU scenario (Vishal Suvagia via mugdha)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1b75e371
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1b75e371
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1b75e371
Branch: refs/heads/branch-2.5
Commit: 1b75e371dcbe4ec739a55318d9cee06ca90b917a
Parents: 7643475
Author: Vishal Suvagia <vi...@yahoo.com>
Authored: Thu Mar 30 17:20:08 2017 +0530
Committer: Mugdha Varadkar <mu...@apache.org>
Committed: Wed Apr 12 10:59:20 2017 +0530
----------------------------------------------------------------------
.../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 7 +++++++
.../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 6 ++++++
.../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 ++++++
.../main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 1 +
.../main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
5 files changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1b75e371/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 9e4abb3..1762d15 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
@@ -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">
http://git-wip-us.apache.org/repos/asf/ambari/blob/1b75e371/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 23c4a76..1f31564 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
@@ -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>
<!--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1b75e371/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index 9921573..f1b26d6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ b/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">
http://git-wip-us.apache.org/repos/asf/ambari/blob/1b75e371/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 7fbd337..0bc85f1 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
@@ -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/>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1b75e371/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index 0f6656b..879fe0f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/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>