Author: suresh
Date: Fri May 24 22:29:49 2013
New Revision: 1486241
URL: http://svn.apache.org/r1486241
Log:
HADOOP-8562. Merge r1477427 for HDFS-4610, r1477408 for YARN-506, r1477403 for
MAPREDUCE-5177
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Application.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1486241&r1=1486240&r2=1486241&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Fri
May 24 22:29:49 2013
@@ -168,6 +168,9 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9372. Fix bad timeout annotations on tests.
(Arpit Agarwal via suresh)
+ MAPREDUCE-5177. Use common utils FileUtil#setReadable/Writable/Executable
&
+ FileUtil#canRead/Write/Execute. (Ivan Mitic via suresh)
+
Release 2.0.5-beta - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Application.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Application.java?rev=1486241&r1=1486240&r2=1486241&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Application.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Application.java
Fri May 24 22:29:49 2013
@@ -113,7 +113,7 @@ class Application<K1 extends WritableCom
cmd.add(interpretor);
}
String executable =
DistributedCache.getLocalCacheFiles(conf)[0].toString();
- if (!new File(executable).canExecute()) {
+ if (!FileUtil.canExecute(new File(executable))) {
// LinuxTaskController sets +x permissions on all distcache files
already.
// In case of DefaultTaskController, set permissions here.
FileUtil.chmod(executable, "u+x");
