diff options
| author | Jonathan Hurley <jhurley@hortonworks.com> | 2017-08-21 16:09:57 -0400 |
|---|---|---|
| committer | Jonathan Hurley <jhurley@hortonworks.com> | 2017-08-21 18:54:56 -0400 |
| commit | 24debeed14654249055077ad5483dc45d127a074 (patch) | |
| tree | 8bd1f224971aa0e4ece90e5def81490043b1ad32 | |
| parent | cf5c2f56e21d41f0f71cab5b9c3fb34fd56c5c4c (diff) | |
AMBARI-21770 - Spark1 Shuffle Property Is Removed Incorrectly on a Stack Upgrade (jonathanhurley)
| -rw-r--r-- | ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml | 7 | ||||
| -rw-r--r-- | ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml | 6 |
2 files changed, 11 insertions, 2 deletions
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 f55f9fb1a9..f90a20ee98 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 @@ -76,7 +76,12 @@ <changes> <definition xsi:type="configure" id="biginsights_4_2_yarn_config_update" summary="Update Yarn configurations"> <type>yarn-site</type> - <replace key="yarn.nodemanager.aux-services" find=",spark_shuffle" replace-with=""/> + <!-- adjust the spark shuffle values for spark1 and spark2 --> + <set key="yarn.nodemanager.aux-services" value="mapreduce_shuffle,spark_shuffle,spark2_shuffle"/> + <set key="yarn.nodemanager.aux-services.spark_shuffle.class" value="org.apache.spark.network.yarn.YarnShuffleService"/> + <set key="yarn.nodemanager.aux-services.spark_shuffle.classpath" value="{{stack_root}}/${hdp.version}/spark/aux/*"/> + <set key="yarn.nodemanager.aux-services.spark2_shuffle.class" value="org.apache.spark.network.yarn.YarnShuffleService"/> + <set key="yarn.nodemanager.aux-services.spark2_shuffle.classpath" value="{{stack_root}}/${hdp.version}/spark2/aux/*"/> </definition> <definition xsi:type="configure" id="yarn_env_security_opts" summary="Adding YARN Security ACLs"> <type>yarn-env</type> 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 02d3a019bb..d85c7ee70a 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 @@ -164,7 +164,11 @@ <changes> <definition xsi:type="configure" id="biginsights_4_2_yarn_config_update" summary="Update Yarn configurations"> <type>yarn-site</type> - <replace key="yarn.nodemanager.aux-services" find=",spark_shuffle" replace-with=""/> + <!-- adjust the spark shuffle values for spark1 based on whether spark is installed --> + <set key="yarn.nodemanager.aux-services" value="mapreduce_shuffle,spark_shuffle" if-type="spark-env" if-key="content" if-key-state="present"/> + <set key="yarn.nodemanager.aux-services.spark_shuffle.class" value="org.apache.spark.network.yarn.YarnShuffleService" if-type="spark-env" if-key="content" if-key-state="present"/> + <set key="yarn.nodemanager.aux-services.spark_shuffle.classpath" value="{{stack_root}}/${hdp.version}/spark/aux/*" if-type="spark-env" if-key="content" if-key-state="present"/> + <insert key="yarn.application.classpath" insert-type="append" newline-after="false" newline-before="false" value=",/usr/hdp/current/ext/hadoop/*"/> </definition> <definition xsi:type="configure" id="yarn_env_security_opts" summary="Adding YARN Security ACLs"> |