Repository: ambari Updated Branches: refs/heads/branch-2.1 100719e98 -> b7f2a3971 refs/heads/trunk baccff832 -> 14587d6eb
AMBARI-13713 Ambari should restore tez.lib.uris to stack defaults when upgrading Tez (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b7f2a397 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b7f2a397 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b7f2a397 Branch: refs/heads/branch-2.1 Commit: b7f2a39717a693b5047a8e01156be0ed05188b4b Parents: 100719e Author: Lisnichenko Dmitro <[email protected]> Authored: Thu Nov 12 18:58:27 2015 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Thu Nov 12 18:58:27 2015 +0200 ---------------------------------------------------------------------- .../stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 3 +++ .../stacks/HDP/2.2/upgrades/config-upgrade.xml | 12 ++++++++++++ .../stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml | 9 +++++++++ .../stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 3 +++ .../resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 3 +++ .../resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 2 ++ .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 6 ++++++ .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 9 +++++++++ .../resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 3 +++ 9 files changed, 50 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f2a397/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml index 4f286ae..f12d0cd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml @@ -278,6 +278,9 @@ <task xsi:type="configure" id="hdp_2_3_0_0_tez_client_adjust_properties"/> </execute-stage> + <execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes for Tez"> + <task xsi:type="configure" id="hdp_2_3_0_0_tez_client_adjust_tez_lib_uris_property"/> + </execute-stage> <!--HIVE--> <execute-stage service="HIVE" component="HIVE_SERVER" title="Apply config changes for Hive Server"> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f2a397/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 14bd266..856bf6c 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 @@ -61,6 +61,18 @@ </changes> </component> </service> + + <service name="TEZ"> + <component name="TEZ_CLIENT"> + <changes> + <definition xsi:type="configure" + id="hdp_2_2_0_0_tez_client_adjust_tez_lib_uris_property"> + <type>tez-site</type> + <set key="tez.lib.uris" value="/hdp/apps/${hdp.version}/tez/tez.tar.gz"/> + </definition> + </changes> + </component> + </service> </services> </upgrade-config-changes> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f2a397/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 40cb607..0ee1bec 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 @@ -231,6 +231,15 @@ </execute-stage> </group> + <group xsi:type="cluster" name="Upgrade service configs" title="Upgrade service configs"> + <direction>UPGRADE</direction> <!-- prevent config changes on downgrade --> + <skippable>true</skippable> <!-- May fix configuration problems manually --> + + <execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes for Tez"> + <task xsi:type="configure" id="hdp_2_2_0_0_tez_client_adjust_tez_lib_uris_property"/> + </execute-stage> + </group> + <!-- Now, restart all of the services. --> <group xsi:type="restart" name="ZOOKEEPER" title="ZooKeeper"> <service-check>false</service-check> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f2a397/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 9a4ddb0..9527976 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 @@ -390,6 +390,9 @@ <task xsi:type="configure" id="hdp_2_3_0_0_tez_client_adjust_properties"/> </execute-stage> + <execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes for Tez"> + <task xsi:type="configure" id="hdp_2_3_0_0_tez_client_adjust_tez_lib_uris_property"/> + </execute-stage> <!--HIVE--> <execute-stage service="HIVE" component="HIVE_SERVER" title="Apply config changes for Hive Server"> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f2a397/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 c8b70d0..5a6cd74 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 @@ -466,6 +466,9 @@ <service name="TEZ"> <component name="TEZ_CLIENT"> + <pre-upgrade> + <task xsi:type="configure" id="hdp_2_2_0_0_tez_client_adjust_tez_lib_uris_property" /> + </pre-upgrade> <upgrade> <task xsi:type="restart-task" /> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f2a397/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 472793b..00d3f6b 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 @@ -592,6 +592,8 @@ <component name="TEZ_CLIENT"> <pre-upgrade> <task xsi:type="configure" id="hdp_2_3_0_0_tez_client_adjust_properties"/> + + <task xsi:type="configure" id="hdp_2_3_0_0_tez_client_adjust_tez_lib_uris_property"/> </pre-upgrade> <upgrade> <task xsi:type="restart-task" /> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f2a397/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 53329ee..54f030b 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 @@ -469,6 +469,12 @@ <set key="tez.am.view-acls" value="*"/> <set key="tez.task.generate.counters.per.io" value="true"/> </definition> + + <definition xsi:type="configure" + id="hdp_2_3_0_0_tez_client_adjust_tez_lib_uris_property"> + <type>tez-site</type> + <set key="tez.lib.uris" value="/hdp/apps/${hdp.version}/tez/tez.tar.gz"/> + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f2a397/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 25620af..561b75d 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 @@ -261,6 +261,15 @@ </execute-stage> </group> + <group xsi:type="cluster" name="Upgrade service configs" title="Upgrade service configs"> + <direction>UPGRADE</direction> <!-- prevent config changes on downgrade --> + <skippable>true</skippable> <!-- May fix configuration problems manually --> + + <execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes for Tez"> + <task xsi:type="configure" id="hdp_2_3_0_0_tez_client_adjust_tez_lib_uris_property"/> + </execute-stage> + </group> + <!-- Now, restart all of the services. --> <group xsi:type="restart" name="ZOOKEEPER" title="ZooKeeper"> <service-check>false</service-check> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f2a397/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 2e0240f..142a6ab 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 @@ -538,6 +538,9 @@ <service name="TEZ"> <component name="TEZ_CLIENT"> + <pre-upgrade> + <task xsi:type="configure" id="hdp_2_3_0_0_tez_client_adjust_tez_lib_uris_property"/> + </pre-upgrade> <upgrade> <task xsi:type="restart-task" /> </upgrade>
