YARN-4388. Cleanup mapreduce.job.hdfs-servers from yarn-default.xml (Junping Du via Varun Saxena)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dd4ed6a5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd4ed6a5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd4ed6a5 Branch: refs/heads/HDFS-9806 Commit: dd4ed6a587bf9cc57eb38d7957d8a907901a1cac Parents: 7e3c327 Author: Varun Saxena <varunsax...@apache.org> Authored: Fri Oct 28 01:41:14 2016 +0530 Committer: Varun Saxena <varunsax...@apache.org> Committed: Fri Oct 28 02:22:25 2016 +0530 ---------------------------------------------------------------------- .../src/main/resources/mapred-default.xml | 5 +++++ .../apache/hadoop/yarn/conf/TestYarnConfigurationFields.java | 4 ---- .../hadoop-yarn-common/src/main/resources/yarn-default.xml | 5 ----- 3 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd4ed6a5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml index fe29212..2b834bd 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml @@ -24,6 +24,11 @@ <configuration> <property> + <name>mapreduce.job.hdfs-servers</name> + <value>${fs.defaultFS}</value> +</property> + +<property> <name>mapreduce.job.committer.setup.cleanup.needed</name> <value>true</value> <description> true, if job needs job-setup and job-cleanup. http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd4ed6a5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java index 668821d..0c40fa9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java @@ -135,10 +135,6 @@ public class TestYarnConfigurationFields extends TestConfigurationFieldsBase { xmlPropsToSkipCompare = new HashSet<String>(); xmlPrefixToSkipCompare = new HashSet<String>(); - // Should probably be moved from yarn-default.xml to mapred-default.xml - xmlPropsToSkipCompare.add("mapreduce.job.hdfs-servers"); - xmlPropsToSkipCompare.add("mapreduce.job.jar"); - // Possibly obsolete, but unable to verify 100% xmlPropsToSkipCompare.add("yarn.nodemanager.aux-services.mapreduce_shuffle.class"); xmlPropsToSkipCompare.add("yarn.resourcemanager.container.liveness-monitor.interval-ms"); http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd4ed6a5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index c7076e5..6c247b0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -1801,11 +1801,6 @@ <!-- Map Reduce Configuration --> <property> - <name>mapreduce.job.hdfs-servers</name> - <value>${fs.defaultFS}</value> - </property> - - <property> <name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name> <value>org.apache.hadoop.mapred.ShuffleHandler</value> </property> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org