Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 56DBD10E70 for ; Thu, 11 Dec 2014 04:17:13 +0000 (UTC) Received: (qmail 20260 invoked by uid 500); 11 Dec 2014 04:17:12 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 20177 invoked by uid 500); 11 Dec 2014 04:17:12 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 20163 invoked by uid 99); 11 Dec 2014 04:17:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Dec 2014 04:17:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4DC30A25602; Thu, 11 Dec 2014 04:17:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: harsh@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: MAPREDUCE-5420. Remove mapreduce.task.tmp.dir from mapred-default.xml. Contributed by James Carman. (harsh) Date: Thu, 11 Dec 2014 04:17:12 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 d39809016 -> 6e06a51e3 MAPREDUCE-5420. Remove mapreduce.task.tmp.dir from mapred-default.xml. Contributed by James Carman. (harsh) (cherry picked from commit cb99f43305bd1577d4ba9527d237ac6cdb9ae730) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6e06a51e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6e06a51e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6e06a51e Branch: refs/heads/branch-2 Commit: 6e06a51e30ffc0f02a4c5ea027ac9956b9dd1269 Parents: d398090 Author: Harsh J Authored: Mon Dec 8 17:34:39 2014 +0530 Committer: Harsh J Committed: Thu Dec 11 09:46:08 2014 +0530 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 ++ .../apache/hadoop/mapreduce/MRJobConfig.java | 2 -- .../hadoop/mapreduce/util/ConfigUtil.java | 2 -- .../src/main/resources/mapred-default.xml | 12 -------- .../resources/job_1329348432655_0001_conf.xml | 1 - .../hadoop/mapred/TestMiniMRChildTask.java | 31 +------------------- 6 files changed, 4 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e06a51e/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index bccb616..eaa37a1 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -8,6 +8,9 @@ Release 2.7.0 - UNRELEASED IMPROVEMENTS + MAPREDUCE-5420. Remove mapreduce.task.tmp.dir from mapred-default.xml + (James Carman via harsh) + MAPREDUCE-5932. Provide an option to use a dedicated reduce-side shuffle log (Gera Shegalov via jlowe) http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e06a51e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java index dd928d4..41e3fa4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java @@ -161,8 +161,6 @@ public interface MRJobConfig { public static final String PRESERVE_FILES_PATTERN = "mapreduce.task.files.preserve.filepattern"; - public static final String TASK_TEMP_DIR = "mapreduce.task.tmp.dir"; - public static final String TASK_DEBUGOUT_LINES = "mapreduce.task.debugout.lines"; public static final String RECORDS_BEFORE_PROGRESS = "mapreduce.task.merge.progress.records"; http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e06a51e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java index 8c7952b..b1756ce 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java @@ -274,8 +274,6 @@ public class ConfigUtil { MRJobConfig.PRESERVE_FAILED_TASK_FILES), new DeprecationDelta("keep.task.files.pattern", MRJobConfig.PRESERVE_FILES_PATTERN), - new DeprecationDelta("mapred.child.tmp", - MRJobConfig.TASK_TEMP_DIR), new DeprecationDelta("mapred.debug.out.lines", MRJobConfig.TASK_DEBUGOUT_LINES), new DeprecationDelta("mapred.merge.recordsBeforeProgress", http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e06a51e/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 f368bdc..83b7655 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 @@ -577,18 +577,6 @@ - mapreduce.task.tmp.dir - ./tmp - To set the value of tmp directory for map and reduce tasks. - If the value is an absolute path, it is directly assigned. Otherwise, it is - prepended with task's working directory. The java tasks are executed with - option -Djava.io.tmpdir='the absolute path of the tmp dir'. Pipes and - streaming are set with environment variable, - TMPDIR='the absolute path of the tmp dir' - - - - mapreduce.map.log.level INFO The logging level for the map task. The allowed levels are: http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e06a51e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml index 0109e09..f988cf6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml @@ -166,7 +166,6 @@ mapreduce.job.end-notification.max.attempts5 mapreduce.jobhistory.max-age-ms10000000000 yarn.resourcemanager.zookeeper-store.session.timeout-ms60000 -mapreduce.task.tmp.dir./tmp dfs.default.chunk.view.size32768 kfs.bytes-per-checksum512 mapreduce.reduce.memory.mb512 http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e06a51e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java index 17b5fd2..6dc1e29 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java @@ -391,36 +391,7 @@ public class TestMiniMRChildTask { ioe.printStackTrace(); } } - - /** - * Tests task's temp directory. - * - * In this test, we give different values to mapreduce.task.tmp.dir - * both relative and absolute. And check whether the temp directory - * is created. We also check whether java.io.tmpdir value is same as - * the directory specified. We create a temp file and check if is is - * created in the directory specified. - */ - @Test - public void testTaskTempDir(){ - try { - JobConf conf = new JobConf(mr.getConfig()); - - // intialize input, output directories - Path inDir = new Path("testing/wc/input"); - Path outDir = new Path("testing/wc/output"); - String input = "The input"; - configure(conf, inDir, outDir, input, - MapClass.class, IdentityReducer.class); - launchTest(conf, inDir, outDir, input); - - } catch(Exception e) { - e.printStackTrace(); - fail("Exception in testing temp dir"); - tearDown(); - } - } - + /** * To test OS dependent setting of default execution path for a MapRed task. * Mainly that we can use MRJobConfig.DEFAULT_MAPRED_ADMIN_USER_ENV to set -