Repository: hadoop Updated Branches: refs/heads/trunk e9c72d04b -> 56feaa40b
MAPREDUCE-7036. ASF License warning in hadoop-mapreduce-client Signed-off-by: Akira Ajisaka <[email protected]> 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 <[email protected]> Authored: Tue Jan 30 00:36:33 2018 +0900 Committer: Akira Ajisaka <[email protected]> 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<K1 extends WritableComparable, V1 extends Writable, // This password is used as shared secret key between this application and // child pipes process byte[] password = jobToken.getPassword(); - String localPasswordFile = new File(".") + Path.SEPARATOR - + "jobTokenPassword"; + String localPasswordFile = new File(conf.get(MRConfig.LOCAL_DIR)) + + Path.SEPARATOR + "jobTokenPassword"; writePasswordToLocalFile(localPasswordFile, password, conf); env.put("hadoop.pipes.shared.secret.location", localPasswordFile); http://git-wip-us.apache.org/repos/asf/hadoop/blob/56feaa40/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java index 88d8f95..13597e0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java @@ -47,6 +47,7 @@ import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.mapred.IFile.Writer; +import org.apache.hadoop.mapreduce.MRConfig; import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.security.TokenCache; import org.apache.hadoop.mapred.Counters; @@ -83,10 +84,10 @@ public class TestPipeApplication { public void testRunner() throws Exception { // clean old password files - File[] psw = cleanTokenPasswordFile(); + JobConf conf = new JobConf(); + File[] psw = cleanTokenPasswordFile(conf); try { RecordReader<FloatWritable, NullWritable> 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<AMRMTokenIdentifier> token = new Token<AMRMTokenIdentifier>( "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: [email protected] For additional commands, e-mail: [email protected]
