Repository: ambari Updated Branches: refs/heads/trunk bdcd39bfe -> 28d24abb1
AMBARI-17853. Added namenode HA configuration adjustments to the upgrade configurations (Laszlo Puskas via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/28d24abb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/28d24abb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/28d24abb Branch: refs/heads/trunk Commit: 28d24abb161f40150c7a64d5adf3c18d1e444a26 Parents: bdcd39b Author: Alejandro Fernandez <[email protected]> Authored: Fri Jul 22 11:14:32 2016 -0700 Committer: Alejandro Fernandez <[email protected]> Committed: Fri Jul 22 11:14:32 2016 -0700 ---------------------------------------------------------------------- .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 6 ++++++ .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 4 ++++ .../src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 1 + 3 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/28d24abb/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 bd1bef2..b2cc1c4 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 @@ -150,6 +150,12 @@ <service name="HDFS"> <component name="NAMENODE"> <changes> + <definition xsi:type="configure" id="hdp_2_5_0_0_namenode_ha_adjustments"> + <type>hdfs-site</type> + <transfer operation="delete" delete-key="dfs.namenode.rpc-address" if-type="hdfs-site" if-key="dfs.nameservices" if-key-state="present"/> + <transfer operation="delete" delete-key="dfs.namenode.http-address" if-type="hdfs-site" if-key="dfs.nameservices" if-key-state="present"/> + <transfer operation="delete" delete-key="dfs.namenode.https-address" if-type="hdfs-site" if-key="dfs.nameservices" if-key-state="present"/> + </definition> <definition xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db"> <type>ranger-hdfs-audit</type> <transfer operation="delete" delete-key="xasecure.audit.destination.db" /> http://git-wip-us.apache.org/repos/asf/ambari/blob/28d24abb/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 065a933..749dda8 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 @@ -318,6 +318,10 @@ </execute-stage> <!-- HDFS --> + <execute-stage service="HDFS" component="NAMENODE" title="Apply config changes for Hdfs Namenode HA"> + <task xsi:type="configure" id="hdp_2_5_0_0_namenode_ha_adjustments"/> + </execute-stage> + <execute-stage service="HDFS" component="NAMENODE" title="Apply config changes for Hdfs Namenode"> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db"/> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/28d24abb/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 d152f34..ca60120 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 @@ -603,6 +603,7 @@ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> <pre-upgrade> + <task xsi:type="configure" id="hdp_2_5_0_0_namenode_ha_adjustments"/> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db" /> </pre-upgrade>
