AMBARI-21539. Resource Manager fails to restart properly during an IOP to HDP upgrade (amagyar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dae2c389 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dae2c389 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dae2c389 Branch: refs/heads/branch-feature-AMBARI-21450 Commit: dae2c3890314903a47dbba075f63945a2acfea1b Parents: e57032d Author: Attila Magyar <[email protected]> Authored: Sun Jul 23 19:31:01 2017 +0200 Committer: Attila Magyar <[email protected]> Committed: Sun Jul 23 19:31:01 2017 +0200 ---------------------------------------------------------------------- .../BigInsights/4.2.5/upgrades/config-upgrade.xml | 8 ++++++++ .../4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 15 ++++++++++++++- .../BigInsights/4.2/upgrades/config-upgrade.xml | 8 ++++++++ .../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 14 ++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/dae2c389/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 13c0518..87a2aef 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 @@ -33,6 +33,10 @@ <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> + <definition xsi:type="configure" id="hadoop_env_zkfc_security_opts" summary="Adding HDFS ZKFC Security ACLs"> + <type>hadoop-env</type> + <insert key="content" value="{% if hadoop_zkfc_opts is defined %} export HADOOP_ZKFC_OPTS="{{hadoop_zkfc_opts}} $HADOOP_ZKFC_OPTS" {% endif %}" insert-type="append" newline-before="true" newline-after="true" /> + </definition> </changes> </component> </service> @@ -44,6 +48,10 @@ <type>yarn-site</type> <replace key="yarn.nodemanager.aux-services" find=",spark_shuffle" replace-with=""/> </definition> + <definition xsi:type="configure" id="yarn_env_security_opts" summary="Adding YARN Security ACLs"> + <type>yarn-env</type> + <insert key="content" value="{% if rm_security_opts is defined %} YARN_OPTS="{{rm_security_opts}} $YARN_OPTS" {% endif %}" insert-type="append" newline-before="true" newline-after="true" /> + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/dae2c389/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 1932364..a7ddd5c 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 @@ -123,7 +123,6 @@ <function>prepare_express_upgrade</function> </task> </execute-stage> - <execute-stage service="RANGER" component="RANGER_ADMIN" title="Backup Ranger Database"> <task xsi:type="manual"> <message>Before continuing, please backup the Ranger Admin database on the following host(s): {{hosts.all}}.</message> @@ -206,12 +205,26 @@ <task xsi:type="configure" id="biginsights_4_2_namenode_adjustments" /> </execute-stage> + <!-- HDFS --> + <execute-stage service="HDFS" component="NAMENODE" title="Adding HDFS ZKFC Security ACLs"> + <task xsi:type="configure" id="hadoop_env_zkfc_security_opts"> + <summary>Adding HDFS ZKFC Security ACLs</summary> + </task> + </execute-stage> + <!-- YARN --> <execute-stage service="YARN" component="RESOURCEMANAGER" title="Update Yarn configurations"> <task xsi:type="configure" id="biginsights_4_2_yarn_config_update" /> </execute-stage> <!-- YARN --> + <execute-stage service="YARN" component="RESOURCEMANAGER" title="Adding YARN Security ACLs"> + <task xsi:type="configure" id="yarn_env_security_opts"> + <summary>Adding YARN Security ACLs</summary> + </task> + </execute-stage> + + <!-- YARN --> <execute-stage service="MAPREDUCE2" component="HISTORYSERVER" title="Apply config changes for HistoryServer"> <task xsi:type="configure" id="biginsights_4_2_mapreduce_application_framework_patch" /> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/dae2c389/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 297aebb..6d00a90 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 @@ -125,6 +125,10 @@ <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> + <definition xsi:type="configure" id="hadoop_env_zkfc_security_opts" summary="Adding HDFS ZKFC Security ACLs"> + <type>hadoop-env</type> + <insert key="content" value="{% if hadoop_zkfc_opts is defined %} export HADOOP_ZKFC_OPTS="{{hadoop_zkfc_opts}} $HADOOP_ZKFC_OPTS" {% endif %}" insert-type="append" newline-before="true" newline-after="true" /> + </definition> </changes> </component> </service> @@ -136,6 +140,10 @@ <type>yarn-site</type> <replace key="yarn.nodemanager.aux-services" find=",spark_shuffle" replace-with=""/> </definition> + <definition xsi:type="configure" id="yarn_env_security_opts" summary="Adding YARN Security ACLs"> + <type>yarn-env</type> + <insert key="content" value="{% if rm_security_opts is defined %} YARN_OPTS="{{rm_security_opts}} $YARN_OPTS" {% endif %}" insert-type="append" newline-before="true" newline-after="true" /> + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/dae2c389/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 b6d39ea..cedc90f 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 @@ -200,12 +200,26 @@ <task xsi:type="configure" id="biginsights_4_2_namenode_adjustments" /> </execute-stage> + <!-- HDFS --> + <execute-stage service="HDFS" component="NAMENODE" title="Adding HDFS ZKFC Security ACLs"> + <task xsi:type="configure" id="hadoop_env_zkfc_security_opts"> + <summary>Adding HDFS ZKFC Security ACLs</summary> + </task> + </execute-stage> + <!-- YARN --> <execute-stage service="YARN" component="RESOURCEMANAGER" title="Update Yarn configurations"> <task xsi:type="configure" id="biginsights_4_2_yarn_config_update" /> </execute-stage> <!-- YARN --> + <execute-stage service="YARN" component="RESOURCEMANAGER" title="Adding YARN Security ACLs"> + <task xsi:type="configure" id="yarn_env_security_opts"> + <summary>Adding YARN Security ACLs</summary> + </task> + </execute-stage> + + <!-- YARN --> <execute-stage service="MAPREDUCE2" component="HISTORYSERVER" title="Apply config changes for HistoryServer"> <task xsi:type="configure" id="biginsights_4_2_mapreduce_application_framework_patch" /> </execute-stage>
