From common-commits-return-78232-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Mon Jan 29 16:39:48 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 98C42180654 for ; Mon, 29 Jan 2018 16:39:48 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 886FB160C31; Mon, 29 Jan 2018 15:39:48 +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 AA6A4160C2C for ; Mon, 29 Jan 2018 16:39:47 +0100 (CET) Received: (qmail 78306 invoked by uid 500); 29 Jan 2018 15:39:46 -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 78297 invoked by uid 99); 29 Jan 2018 15:39:46 -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; Mon, 29 Jan 2018 15:39:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 956E8E152C; Mon, 29 Jan 2018 15:39:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: MAPREDUCE-7036. ASF License warning in hadoop-mapreduce-client Date: Mon, 29 Jan 2018 15:39:46 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk e9c72d04b -> 56feaa40b MAPREDUCE-7036. ASF License warning in hadoop-mapreduce-client Signed-off-by: Akira Ajisaka Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/56feaa40 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/56feaa40 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/56feaa40 Branch: refs/heads/trunk Commit: 56feaa40bb94fcaa96ae668eebfabec4611928c0 Parents: e9c72d0 Author: Takanobu Asanuma Authored: Tue Jan 30 00:36:33 2018 +0900 Committer: Akira Ajisaka Committed: Tue Jan 30 00:39:39 2018 +0900 ---------------------------------------------------------------------- .../apache/hadoop/mapred/pipes/Application.java | 5 +++-- .../hadoop/mapred/pipes/TestPipeApplication.java | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/56feaa40/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Application.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Application.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Application.java index 83d2509..5c8aab9 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Application.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Application.java @@ -45,6 +45,7 @@ import org.apache.hadoop.mapred.RecordReader; import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.mapred.TaskAttemptID; import org.apache.hadoop.mapred.TaskLog; +import org.apache.hadoop.mapreduce.MRConfig; import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.filecache.DistributedCache; import org.apache.hadoop.mapreduce.security.SecureShuffleUtils; @@ -103,8 +104,8 @@ class Application rReader = new ReaderPipesMapRunner(); - JobConf conf = new JobConf(); conf.set(Submitter.IS_JAVA_RR, "true"); // for stdour and stderror @@ -162,7 +163,7 @@ public class TestPipeApplication { TestTaskReporter reporter = new TestTaskReporter(); - File[] psw = cleanTokenPasswordFile(); + File[] psw = cleanTokenPasswordFile(conf); try { conf.set(MRJobConfig.TASK_ATTEMPT_ID, taskName); @@ -247,7 +248,7 @@ public class TestPipeApplication { JobConf conf = new JobConf(); - File[] psw = cleanTokenPasswordFile(); + File[] psw = cleanTokenPasswordFile(conf); System.setProperty("test.build.data", "target/tmp/build/TEST_SUBMITTER_MAPPER/data"); @@ -388,8 +389,8 @@ public class TestPipeApplication { @Test public void testPipesReduser() throws Exception { - File[] psw = cleanTokenPasswordFile(); JobConf conf = new JobConf(); + File[] psw = cleanTokenPasswordFile(conf); try { Token token = new Token( "user".getBytes(), "password".getBytes(), new Text("kind"), new Text( @@ -506,14 +507,16 @@ public class TestPipeApplication { } - private File[] cleanTokenPasswordFile() throws Exception { + private File[] cleanTokenPasswordFile(JobConf conf) throws Exception { File[] result = new File[2]; - result[0] = new File("./jobTokenPassword"); + result[0] = new File(conf.get(MRConfig.LOCAL_DIR) + Path.SEPARATOR + + "jobTokenPassword"); if (result[0].exists()) { FileUtil.chmod(result[0].getAbsolutePath(), "700"); assertTrue(result[0].delete()); } - result[1] = new File("./.jobTokenPassword.crc"); + result[1] = new File(conf.get(MRConfig.LOCAL_DIR) + Path.SEPARATOR + + ".jobTokenPassword.crc"); if (result[1].exists()) { FileUtil.chmod(result[1].getAbsolutePath(), "700"); result[1].delete(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org