Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 200E7200BAA for ; Thu, 27 Oct 2016 22:52:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1EA54160AF6; Thu, 27 Oct 2016 20:52:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6659D160AE6 for ; Thu, 27 Oct 2016 22:52:50 +0200 (CEST) Received: (qmail 5852 invoked by uid 500); 27 Oct 2016 20:52:49 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 5841 invoked by uid 99); 27 Oct 2016 20:52:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Oct 2016 20:52:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1A89AEFE5E; Thu, 27 Oct 2016 20:52:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: varunsaxena@apache.org To: common-commits@hadoop.apache.org Message-Id: <240287f8ce434ce891bd3d32067cc119@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-4388. Cleanup mapreduce.job.hdfs-servers from yarn-default.xml (Junping Du via Varun Saxena) Date: Thu, 27 Oct 2016 20:52:49 +0000 (UTC) archived-at: Thu, 27 Oct 2016 20:52:51 -0000 Repository: hadoop Updated Branches: refs/heads/trunk 7e3c327d3 -> dd4ed6a58 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/trunk Commit: dd4ed6a587bf9cc57eb38d7957d8a907901a1cac Parents: 7e3c327 Author: Varun Saxena Authored: Fri Oct 28 01:41:14 2016 +0530 Committer: Varun Saxena 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 @@ + mapreduce.job.hdfs-servers + ${fs.defaultFS} + + + mapreduce.job.committer.setup.cleanup.needed true 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(); xmlPrefixToSkipCompare = new HashSet(); - // 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 @@ - mapreduce.job.hdfs-servers - ${fs.defaultFS} - - - yarn.nodemanager.aux-services.mapreduce_shuffle.class org.apache.hadoop.mapred.ShuffleHandler --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org