Repository: ambari Updated Branches: refs/heads/branch-2.5 86787c37f -> 212ee1cb0
AMBARI-21527 Restart of MR2 History Server failed due to wrong NameNode RPC address (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/212ee1cb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/212ee1cb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/212ee1cb Branch: refs/heads/branch-2.5 Commit: 212ee1cb04483a2cd7fafb4304a1c5879f2895dc Parents: 86787c3 Author: Di Li <[email protected]> Authored: Thu Jul 20 14:21:57 2017 -0400 Committer: Di Li <[email protected]> Committed: Thu Jul 20 14:21:57 2017 -0400 ---------------------------------------------------------------------- .../stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml | 7 +++++++ .../4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 5 +++++ .../stacks/BigInsights/4.2/upgrades/config-upgrade.xml | 7 +++++++ .../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 5 +++++ 4 files changed, 24 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/212ee1cb/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml index e476d57..c8549b3 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml @@ -26,6 +26,13 @@ <replace key="content" find="export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/iop/current/hadoop-client/lib/native/Linux-amd64-64" replace-with="export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/hdp/current/hadoop-client/lib/native" /> <replace key="content" find="export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}${JAVA_JDBC_LIBS}:${MAPREDUCE_LIBS}" replace-with="export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}${JAVA_JDBC_LIBS}:${MAPREDUCE_LIBS} if [ -d "/usr/lib/hadoop-lzo" ]; then export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:/usr/lib/hadoop-lzo/lib/* export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/lib/hadoop-lzo/lib/native fi"/> </definition> + <definition xsi:type="configure" id="biginsights_4_2_namenode_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"/> + <transfer operation="delete" delete-key="dfs.namenode.rpc-address" if-type="core-site" if-key="fs.defaultFS" if-key-state="present"/> <!-- Make sure to use the existing fs.defaultFS for the non-HA case --> + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/212ee1cb/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index cbd0550..57e731e 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -200,6 +200,11 @@ <task xsi:type="configure" id="biginsights_4_2_namenode_update_hadoop_env" /> </execute-stage> + <!-- HDFS --> + <execute-stage service="HDFS" component="NAMENODE" title="Apply config changes for Hadoop NameNode"> + <task xsi:type="configure" id="biginsights_4_2_namenode_adjustments" /> + </execute-stage> + <!-- YARN --> <execute-stage service="YARN" component="RESOURCEMANAGER" title="Update Yarn configurations"> <task xsi:type="configure" id="biginsights_4_2_yarn_config_update" /> http://git-wip-us.apache.org/repos/asf/ambari/blob/212ee1cb/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml index dada6e2..bf6dd6b 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml @@ -118,6 +118,13 @@ <replace key="content" find="export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/iop/current/hadoop-client/lib/native/Linux-amd64-64" replace-with="export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/hdp/current/hadoop-client/lib/native" /> <replace key="content" find="export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}${JAVA_JDBC_LIBS}:${MAPREDUCE_LIBS}" replace-with="export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}${JAVA_JDBC_LIBS}:${MAPREDUCE_LIBS} if [ -d "/usr/lib/hadoop-lzo" ]; then export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:/usr/lib/hadoop-lzo/lib/* export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/lib/hadoop-lzo/lib/native fi"/> </definition> + <definition xsi:type="configure" id="biginsights_4_2_namenode_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"/> + <transfer operation="delete" delete-key="dfs.namenode.rpc-address" if-type="core-site" if-key="fs.defaultFS" if-key-state="present"/> <!-- Make sure to use the existing fs.defaultFS for the non-HA case --> + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/212ee1cb/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index 3ea20ed..b6d39ea 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -195,6 +195,11 @@ <task xsi:type="configure" id="biginsights_4_2_namenode_update_hadoop_env" /> </execute-stage> + <!-- HDFS --> + <execute-stage service="HDFS" component="NAMENODE" title="Apply config changes for Hadoop NameNode"> + <task xsi:type="configure" id="biginsights_4_2_namenode_adjustments" /> + </execute-stage> + <!-- YARN --> <execute-stage service="YARN" component="RESOURCEMANAGER" title="Update Yarn configurations"> <task xsi:type="configure" id="biginsights_4_2_yarn_config_update" />
