Repository: ambari Updated Branches: refs/heads/trunk 4a9dee610 -> ca2c83582
AMBARI-20505. Changes needed to handle AMBARI-19623 in EU/RU scenario (Vishal Sugavia via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ca2c8358 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ca2c8358 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ca2c8358 Branch: refs/heads/trunk Commit: ca2c83582e135bb5410b62775292a780e68757eb Parents: 4a9dee6 Author: Alejandro Fernandez <[email protected]> Authored: Wed Mar 22 17:20:53 2017 -0700 Committer: Alejandro Fernandez <[email protected]> Committed: Wed Mar 22 17:20:53 2017 -0700 ---------------------------------------------------------------------- .../resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 9 ++++++++- .../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, 22 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ca2c8358/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 c13724b..19b55ec 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 @@ -144,7 +144,14 @@ <definition xsi:type="configure" id="hdp_2_5_4_0_atlas_exclude_tls_protocol" summary="Excluding TLS v1.2 Protocol"> <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> + + <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> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/ca2c8358/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 39cb0dc..6f7fbd0 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 valuesProtocols"> + <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/ca2c8358/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 57a5203..063b362 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 @@ -446,6 +446,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/ca2c8358/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 b5b45cb..ab8e8b5 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 @@ -936,6 +936,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/ca2c8358/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 44d0a2a..e637c4c 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 @@ -1068,6 +1068,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>
