ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alejan...@apache.org
Subject ambari git commit: AMBARI-14836. RU/EU from HDP 2.3 to 2.4 fails on HDFS Balancer command if NN HA since config dfs.namenode.rpc-address needs to be deleted (alejandro)
Date Thu, 28 Jan 2016 22:59:22 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 dffc6ddd7 -> 3895968b7


AMBARI-14836. RU/EU from HDP 2.3 to 2.4 fails on HDFS Balancer command if NN HA since config
dfs.namenode.rpc-address needs to be deleted (alejandro)


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

Branch: refs/heads/branch-2.2
Commit: 3895968b72ab278812cce7abc6d86a62adec490e
Parents: dffc6dd
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Thu Jan 28 12:50:31 2016 -0800
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Thu Jan 28 14:59:08 2016 -0800

----------------------------------------------------------------------
 .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml   |  5 +++++
 .../resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml    |  4 ++++
 .../resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 11 +++++++++++
 3 files changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3895968b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
index ee83348..9b36ec9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
@@ -268,6 +268,11 @@
       <skippable>true</skippable>  <!-- May fix configuration problems manually
-->
       <supports-auto-skip-failure>false</supports-auto-skip-failure>
 
+      <!--HDFS-->
+      <execute-stage service="HDFS" component="NAMENODE" title="Apply config changes for
NameNode">
+        <task xsi:type="configure" id="hdp_2_4_0_0_namenode_ha_adjustments"/>
+      </execute-stage>
+
       <execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn
Properties for Spark">
         <task xsi:type="server_action" summary="Calculating Yarn Properties for Spark
Shuffle" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig"
/>
       </execute-stage>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3895968b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
index f248293..33a9b16 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
@@ -436,6 +436,10 @@
       <component name="NAMENODE">
         <pre-downgrade /> <!--  no-op to prevent config changes on downgrade -->
 
+        <pre-upgrade>
+          <task xsi:type="configure" id="hdp_2_4_0_0_namenode_ha_adjustments"/>
+        </pre-upgrade>
+
         <upgrade>
           <task xsi:type="restart-task" />
         </upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3895968b/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 0145f3b..5949486 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
@@ -20,6 +20,17 @@
 
   <services>
 
+    <service name="HDFS">
+      <component name="NAMENODE">
+        <changes>
+          <definition xsi:type="configure" id="hdp_2_4_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"/>
+          </definition>
+        </changes>
+      </component>
+    </service>
+
     <service name="HBASE">
       <component name="HBASE_MASTER">
         <changes>


Mime
View raw message