Author: ddas
Date: Fri Oct 1 22:29:48 2010
New Revision: 1003690
URL: http://svn.apache.org/viewvc?rev=1003690&view=rev
Log:
MAPREDUCE-2082. Fixes Pipes to create the jobtoken file in the right place. Contributed by
Jitendra Pandey.
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/pipes/Application.java
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1003690&r1=1003689&r2=1003690&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Oct 1 22:29:48 2010
@@ -319,6 +319,9 @@ Trunk (unreleased changes)
MAPREDUCE-1816. HAR files used for RAID parity-bite have configurable
partfile size. (Ramkumar Vadali via dhruba)
+ MAPREDUCE-2082. Fixes Pipes to create the jobtoken file in the right
+ place. (Jitendra Pandey via ddas)
+
Release 0.21.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/pipes/Application.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/pipes/Application.java?rev=1003690&r1=1003689&r2=1003690&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/pipes/Application.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/pipes/Application.java Fri Oct
1 22:29:48 2010
@@ -101,7 +101,7 @@ class Application<K1 extends WritableCom
// This password is used as shared secret key between this application and
// child pipes process
byte[] password = jobToken.getPassword();
- String localPasswordFile = conf.getJobLocalDir() + Path.SEPARATOR
+ String localPasswordFile = new File(".") + Path.SEPARATOR
+ "jobTokenPassword";
writePasswordToLocalFile(localPasswordFile, password, conf);
env.put("hadoop.pipes.shared.secret.location", localPasswordFile);
@@ -168,10 +168,6 @@ class Application<K1 extends WritableCom
byte[] password, JobConf conf) throws IOException {
FileSystem localFs = FileSystem.getLocal(conf);
Path localPath = new Path(localPasswordFile);
- if (localFs.isFile(localPath)) {
- LOG.debug("Password file is already created by previous path");
- return;
- }
FSDataOutputStream out = FileSystem.create(localFs, localPath,
new FsPermission("400"));
out.write(password);
|