Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -c 1213575 from trunk to branch-0.23 to fix MAPREDUCE-3537. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213576 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-12-13 06:35:10 +00:00
parent f340be0927
commit 88f815fc54
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -224,6 +224,9 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3510. Capacity Scheduler inherited ACLs not displayed by mapred queue MAPREDUCE-3510. Capacity Scheduler inherited ACLs not displayed by mapred queue
-showacls (Jonathan Eagles via mahadev) -showacls (Jonathan Eagles via mahadev)
MAPREDUCE-3537. Fix race condition in DefaultContainerExecutor which led
to container localization occuring in wrong directories. (acmurthy)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java
View File

@ -75,7 +75,7 @@ public class DefaultContainerExecutor extends ContainerExecutor {
} }
@Override @Override
public void startLocalizer(Path nmPrivateContainerTokensPath, public synchronized void startLocalizer(Path nmPrivateContainerTokensPath,
InetSocketAddress nmAddr, String user, String appId, String locId, InetSocketAddress nmAddr, String user, String appId, String locId,
List<String> localDirs, List<String> logDirs) List<String> localDirs, List<String> logDirs)
throws IOException, InterruptedException { throws IOException, InterruptedException {