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

Merge -r 1165889:1165890 from trunk to branch-0.23 to fix MAPREDUCE-2687. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165891 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-09-06 21:50:44 +00:00
parent 65d5b0b9d3
commit 301e322096
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1198,6 +1198,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-2882. TestLineRecordReader depends on ant jars. (todd) MAPREDUCE-2882. TestLineRecordReader depends on ant jars. (todd)
MAPREDUCE-2687. Fix NodeManager to use the right version of
LocalDirAllocator.getLocalPathToWrite. (mahadev & acmurthy)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java
View File

@ -100,7 +100,8 @@ public class ContainerLaunch implements Callable<Integer> {
String appIdStr = app.toString(); String appIdStr = app.toString();
Path containerLogDir = Path containerLogDir =
this.logDirsSelector.getLocalPathForWrite(appIdStr + Path.SEPARATOR this.logDirsSelector.getLocalPathForWrite(appIdStr + Path.SEPARATOR
+ containerIdStr, LocalDirAllocator.SIZE_UNKNOWN, this.conf); + containerIdStr, LocalDirAllocator.SIZE_UNKNOWN, this.conf,
false);
for (String str : command) { for (String str : command) {
// TODO: Should we instead work via symlinks without this grammar? // TODO: Should we instead work via symlinks without this grammar?
newCmds.add(str.replace(ApplicationConstants.LOG_DIR_EXPANSION_VAR, newCmds.add(str.replace(ApplicationConstants.LOG_DIR_EXPANSION_VAR,
@ -147,7 +148,7 @@ public class ContainerLaunch implements Callable<Integer> {
+ Path.SEPARATOR + user + Path.SEPARATOR + Path.SEPARATOR + user + Path.SEPARATOR
+ ContainerLocalizer.APPCACHE + Path.SEPARATOR + appIdStr + ContainerLocalizer.APPCACHE + Path.SEPARATOR + appIdStr
+ Path.SEPARATOR + containerIdStr, + Path.SEPARATOR + containerIdStr,
LocalDirAllocator.SIZE_UNKNOWN, this.conf); LocalDirAllocator.SIZE_UNKNOWN, this.conf, false);
try { try {
// /////////// Write out the container-script in the nmPrivate space. // /////////// Write out the container-script in the nmPrivate space.
String[] localDirs = String[] localDirs =