Revert "AMBARI-21421 EU upgrade pack to update Hive and Yarn properties to remove IOP/BigSQL properties (dili)"
This reverts commit 78255d7689b04d776c013af7afe1e37e8fbf9671. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bad4e5c3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bad4e5c3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bad4e5c3 Branch: refs/heads/branch-2.5 Commit: bad4e5c3c52e824428d0031ecff9e6e03e28809e Parents: a42e273 Author: Di Li <[email protected]> Authored: Mon Jul 10 13:41:34 2017 -0400 Committer: Di Li <[email protected]> Committed: Mon Jul 10 13:41:34 2017 -0400 ---------------------------------------------------------------------- .../BigInsights/4.2.5/upgrades/config-upgrade.xml | 11 ----------- .../4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 5 ----- .../BigInsights/4.2/upgrades/config-upgrade.xml | 14 +------------- .../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 5 ----- 4 files changed, 1 insertion(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bad4e5c3/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml index bff6672..6597055 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml @@ -30,17 +30,6 @@ </component> </service> - <service name="YARN"> - <component name="RESOURCEMANAGER"> - <changes> - <definition xsi:type="configure" id="biginsights_4_2_yarn_config_update" summary="Update Yarn configurations"> - <type>yarn-site</type> - <find key="yarn.nodemanager.aux-services" find=",spark_shuffle" replace-with=""/> - </definition> - </changes> - </component> - </service> - <service name="MAPREDUCE2"> <component name="HISTORYSERVER"> <changes> http://git-wip-us.apache.org/repos/asf/ambari/blob/bad4e5c3/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index e9c8541..4626005 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -177,11 +177,6 @@ </execute-stage> <!-- YARN --> - <execute-stage service="YARN" component="RESOURCEMANAGER" title="Update Yarn configurations"> - <task xsi:type="configure" id="biginsights_4_2_yarn_config_update" /> - </execute-stage> - - <!-- YARN --> <execute-stage service="MAPREDUCE2" component="HISTORYSERVER" title="Apply config changes for HistoryServer"> <task xsi:type="configure" id="biginsights_4_2_mapreduce_application_framework_patch" /> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/bad4e5c3/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml index d931093..6597055 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml @@ -29,18 +29,7 @@ </changes> </component> </service> - - <service name="YARN"> - <component name="RESOURCEMANAGER"> - <changes> - <definition xsi:type="configure" id="biginsights_4_2_yarn_config_update" summary="Update Yarn configurations"> - <type>yarn-site</type> - <find key="yarn.nodemanager.aux-services" find=",spark_shuffle" replace-with=""/> - </definition> - </changes> - </component> - </service> - + <service name="MAPREDUCE2"> <component name="HISTORYSERVER"> <changes> @@ -57,7 +46,6 @@ <changes> <definition xsi:type="configure" id="biginsights_4_2_0_0_hive_server_configure_authentication" summary="Configuring hive authentication"> <type>hive-site</type> - <transfer operation="delete" delete-key="hive.metastore.event.listeners" if-key="hive.metastore.event.listeners" if-type="hive-site" if-value="com.ibm.biginsights.bigsql.sync.BIEventListener"> <transfer operation="delete" delete-key="hive.server2.authentication.ldap.url" if-key="hive.server2.authentication" if-type="hive-site" if-value="NONE"/> <transfer operation="delete" delete-key="hive.server2.authentication.ldap.baseDN" if-key="hive.server2.authentication" if-type="hive-site" if-value="NONE"/> <transfer operation="delete" delete-key="hive.server2.authentication.pam.services" if-key="hive.server2.authentication" if-type="hive-site" if-value="NONE"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/bad4e5c3/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index e9c8541..4626005 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -177,11 +177,6 @@ </execute-stage> <!-- YARN --> - <execute-stage service="YARN" component="RESOURCEMANAGER" title="Update Yarn configurations"> - <task xsi:type="configure" id="biginsights_4_2_yarn_config_update" /> - </execute-stage> - - <!-- YARN --> <execute-stage service="MAPREDUCE2" component="HISTORYSERVER" title="Apply config changes for HistoryServer"> <task xsi:type="configure" id="biginsights_4_2_mapreduce_application_framework_patch" /> </execute-stage>
