You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2017/04/03 13:15:48 UTC
ambari git commit: AMBARI-20571. Remove property atlas.cluster.name
from hive-site during HDP stack upgrades (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 0bace78c1 -> 7f472bab0
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/7f472bab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7f472bab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7f472bab
Branch: refs/heads/branch-2.5
Commit: 7f472bab0a4cb54b09a09336263af238dee25bee
Parents: 0bace78
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Apr 3 16:15:42 2017 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Apr 3 16:15:42 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/7f472bab/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 c5d11f8..9835a5c 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/7f472bab/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 22f277e..4c00e8b 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/7f472bab/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 dfcd29f..d65b527 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
@@ -465,6 +465,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/7f472bab/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 365022d..fb63290 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
@@ -861,6 +861,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/7f472bab/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 27d0059..1b39e65 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
@@ -887,6 +887,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/7f472bab/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 43241eb..8434630 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/7f472bab/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 dace921..ad97dfd 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/7f472bab/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 7fda46a..1bad2c4 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
@@ -506,6 +506,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/7f472bab/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 fdcc368..7aa17be 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
@@ -862,6 +862,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/7f472bab/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 40784aa..eb9d6ba 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
@@ -895,6 +895,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/7f472bab/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 9bc9825..4a6e98b 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
@@ -415,6 +415,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"/>
@@ -458,6 +459,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/7f472bab/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 e7ada04..bce067a 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/7f472bab/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 9139760..6faea72 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
@@ -552,6 +552,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/7f472bab/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 a030adb..e92cbf3 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/7f472bab/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 c226492..4666ca7 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
@@ -806,6 +806,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 />