AMBARI-20571. Remove property atlas.cluster.name from hive-site during HDP stack upgrades (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/09b0b46c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/09b0b46c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/09b0b46c Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 09b0b46cc66169b9741c9833cdb42196690b5fd3 Parents: 6892e43 Author: Andrew Onishuk <[email protected]> Authored: Mon Apr 3 16:18:23 2017 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Mon Apr 3 16:18:23 2017 +0300 ---------------------------------------------------------------------- .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml | 6 ++++++ .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 6 ++++++ .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 6 ++++++ .../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 1 + .../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 + .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 5 +++++ .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 6 ++++++ .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 6 ++++++ .../src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 1 + .../src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 + .../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 6 ++++++ .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 6 ++++++ .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 ++++++ .../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 6 ++++++ .../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 + 15 files changed, 64 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/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 b1bbb32..63cf5f5 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 @@ -204,6 +204,12 @@ <type>hive-site</type> <set key="hive.enforce.bucketing" value="true"/> </definition> + + <definition xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name"> + <type>hive-site</type> + <transfer operation="delete" delete-key="atlas.cluster.name"/> + </definition> + </changes> </component> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/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 adccac0..73a4f5e 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 @@ -393,6 +393,12 @@ </task> </execute-stage> + <execute-stage service="HIVE" component="HIVE_SERVER" title="Updating Hive properties"> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name"> + <summary>Removing atlas.cluster.name property</summary> + </task> + </execute-stage> + <!--OOZIE--> <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml index b5dce2d..3a7df7d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml @@ -472,6 +472,12 @@ </task> </execute-stage> + <execute-stage service="HIVE" component="HIVE_SERVER" title="Updating Hive properties"> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name"> + <summary>Removing atlas.cluster.name property</summary> + </task> + </execute-stage> + <!--OOZIE--> <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/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 9396f80..ca612b8 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 @@ -860,6 +860,7 @@ <task xsi:type="configure" id="hdp_2_4_0_0_hive_server_configure_authentication"/> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hive_audit_db" /> <task xsi:type="configure" id="hive_log4j_parameterize" /> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name" /> <!-- Remove Atlas configs that were incorrectly added to hive-site instead of Atlas' application.properties. --> <task xsi:type="configure" id="hdp_2_5_0_0_remove_hive_atlas_configs" /> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml index 7917343..1fbf81e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml @@ -891,6 +891,7 @@ <pre-upgrade> <task xsi:type="configure" id="hdp_2_4_0_0_hive_server_configure_authentication"/> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hive_audit_db" /> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name" /> <!-- Remove Atlas configs that were incorrectly added to hive-site instead of Atlas' application.properties. --> <task xsi:type="configure" id="hdp_2_5_0_0_remove_hive_atlas_configs" /> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/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 48a2d96..2345d08 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 @@ -106,6 +106,11 @@ <type>hive-site</type> <set key="hive.enforce.bucketing" value="true"/> </definition> + + <definition xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name"> + <type>hive-site</type> + <transfer operation="delete" delete-key="atlas.cluster.name"/> + </definition> </changes> </component> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/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 cd63651..bb6506e 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 @@ -419,6 +419,12 @@ </task> </execute-stage> + <execute-stage service="HIVE" component="HIVE_SERVER" title="Updating Hive properties"> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name"> + <summary>Removing atlas.cluster.name property</summary> + </task> + </execute-stage> + <!-- HBASE --> <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes for Hbase Master"> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hbase_audit_db"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml index df05749..c6c3a0d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml @@ -513,6 +513,12 @@ </task> </execute-stage> + <execute-stage service="HIVE" component="HIVE_SERVER" title="Updating Hive properties"> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name"> + <summary>Removing atlas.cluster.name property</summary> + </task> + </execute-stage> + <!-- HBASE --> <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes for Hbase Master"> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hbase_audit_db"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/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 a642320..4654ac8 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 @@ -861,6 +861,7 @@ <summary>Update hive-env content</summary> </task> <task xsi:type="configure" id="hive_log4j_parameterize" /> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name" /> </pre-upgrade> <pre-downgrade/> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml index ee8e10e..ec7d8b8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml @@ -899,6 +899,7 @@ <task xsi:type="configure" id="hive_log4j_parameterize" /> <task xsi:type="configure" id="hdp_2_6_0_0_hive_set_hive_enforce_bucketing_property" /> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name" /> </pre-upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/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 090e66f..b70b9df 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 @@ -432,6 +432,7 @@ <regex-replace key="content" find="property.llap.daemon.log.maxbackupindex = ([0-9]+)" replace-with="property.llap.daemon.log.maxbackupindex = {{hive_llap_log_maxbackupindex}}"/> </definition> + <definition xsi:type="configure" id="hdp_2_6_0_0_hive_set_hive_enforce_bucketing_property"> <type>hive-site</type> <set key="hive.enforce.bucketing" value="true"/> @@ -481,6 +482,11 @@ <transfer operation="copy" from-type="hive-site" from-key="hive.tez.container.size" to-key="hive.tez.container.size" default-value="682" if-type="hive-interactive-site" if-key="hive.tez.container.size" if-key-state="absent"/> </definition> + <definition xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name"> + <type>hive-site</type> + <transfer operation="delete" delete-key="atlas.cluster.name"/> + </definition> + </changes> </component> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/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 6f7fbd0..95ca3a2 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 @@ -292,6 +292,12 @@ </task> </execute-stage> + <execute-stage service="HIVE" component="HIVE_SERVER" title="Updating Hive properties"> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name"> + <summary>Removing atlas.cluster.name property</summary> + </task> + </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"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/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 c5024b6..05ecb2c 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 @@ -569,6 +569,12 @@ <summary>Updating the Hive Log4J2 properties to include parameterizations</summary> </task> </execute-stage> + + <execute-stage service="HIVE" component="HIVE_SERVER" title="Updating Hive properties"> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name"> + <summary>Removing atlas.cluster.name property</summary> + </task> + </execute-stage> <!-- SPARK --> <execute-stage service="SPARK" component="LIVY_SERVER" title="Apply config changes for Livy Server"> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/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 ab8e8b5..37f92fd 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 @@ -729,6 +729,12 @@ </component> <component name="HIVE_SERVER"> + <pre-upgrade> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name" /> + </pre-upgrade> + + <pre-downgrade /> + <upgrade> <task xsi:type="restart-task" /> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/09b0b46c/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 e2482e5..0dab6f4 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 @@ -813,6 +813,7 @@ <task xsi:type="configure" id="hive_llap_log4j_parameterize" /> <task xsi:type="configure" id="hdp_2_6_0_0_hive_set_hive_enforce_bucketing_property" /> <task xsi:type="configure" id="hdp_2_6_0_0_copy_hive_tez_container_size_to_hiveInteractive" /> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name" /> </pre-upgrade> <pre-downgrade />
