ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject ambari git commit: AMBARI-15491. Non NameNode-HA properties still in hdfs-site.xml after enabling HA (scripts refer to non-existent property values) (aonishuk)
Date Mon, 21 Mar 2016 16:12:27 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 7a8d3e131 -> 0c650bcfa


AMBARI-15491. Non NameNode-HA properties still in hdfs-site.xml after enabling HA (scripts
refer to non-existent property values) (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0c650bcf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0c650bcf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0c650bcf

Branch: refs/heads/branch-2.2
Commit: 0c650bcfafeb6ec0c34328625b378a8eea77740b
Parents: 7a8d3e1
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Mon Mar 21 18:11:35 2016 +0200
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Mon Mar 21 18:12:22 2016 +0200

----------------------------------------------------------------------
 .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml    | 2 ++
 .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0c650bcf/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 04d5d6d..e2945fc 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
@@ -172,6 +172,8 @@
           <definition xsi:type="configure" id="hdp_2_3_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_3_0_0_modify_hadoop_env" summary="Modify
hadoop-env.sh">

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c650bcf/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 1cc2668..e8c8861 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
@@ -23,9 +23,11 @@
     <service name="HDFS">
       <component name="NAMENODE">
         <changes>
-          <definition xsi:type="configure" id="hdp_2_4_0_0_namenode_ha_adjustments">
+          <definition xsi:type="configure" id="hdp_2_4_0_0_namenode_ha_adjustments" summary="Removing
unused properties when NN HA is enabled">
             <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>
         </changes>
       </component>


Mime
View raw message