Author: szetszwo
Date: Thu Jul 4 03:45:01 2013
New Revision: 1499637
URL: http://svn.apache.org/r1499637
Log:
svn merge -c 1499217 from branch-2 for MAPREDUCE-5357. Job staging directory
owner checking could fail on Windows.
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/ (props
changed)
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmissionFiles.java
Propchange: hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project:r1499217
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1499637&r1=1499636&r2=1499637&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
Thu Jul 4 03:45:01 2013
@@ -442,6 +442,9 @@ Release 2.1.0-beta - 2013-07-02
MAPREDUCE-5359. JobHistory should not use File.separator to match timestamp
in path. (Chuan Liu via cnauroth)
+ MAPREDUCE-5357. Job staging directory owner checking could fail on Windows.
+ (Chuan Liu via cnauroth)
+
MAPREDUCE-5291. Change MR App to use updated property names in
container-log4j.properties. (Zhijie Shen via sseth)
Propchange:
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt:r1499217
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmissionFiles.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmissionFiles.java?rev=1499637&r1=1499636&r2=1499637&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmissionFiles.java
(original)
+++
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmissionFiles.java
Thu Jul 4 03:45:01 2013
@@ -124,6 +124,7 @@ public class JobSubmissionFiles {
} else {
fs.mkdirs(stagingArea,
new FsPermission(JOB_DIR_PERMISSION));
+ fs.setOwner(stagingArea, currentUser, null);
}
return stagingArea;
}
