Author: acmurthy
Date: Sat Aug 13 20:11:26 2011
New Revision: 1157418
URL: http://svn.apache.org/viewvc?rev=1157418&view=rev
Log:
Reverted commit for LocalDirAllocator
Modified:
hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java
Modified: hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/CHANGES.txt?rev=1157418&r1=1157417&r2=1157418&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/MR-279/mapreduce/CHANGES.txt Sat Aug 13 20:11:26 2011
@@ -7,9 +7,6 @@ Trunk (unreleased changes)
MAPREDUCE-2639. Bug fixes in speculate.DataStatistics. (Josh Wills via
acmurthy)
- Ensure NM uses the right LocalDirAllocator.getLocalPathForWrite call which
- doesn't interfere with disk-fail-in-place. (acmurthy)
-
MAPREDUCE-2808. pull MAPREDUCE-2797 into mr279 branch (thomas graves via mahadev)
Fixed CS locality wait factor. (acmurthy)
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java?rev=1157418&r1=1157417&r2=1157418&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java
(original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java
Sat Aug 13 20:11:26 2011
@@ -100,7 +100,7 @@ public class ContainerLaunch implements
String appIdStr = app.toString();
Path containerLogDir =
this.logDirsSelector.getLocalPathForWrite(appIdStr + Path.SEPARATOR
- + containerIdStr, LocalDirAllocator.SIZE_UNKNOWN, this.conf, false);
+ + containerIdStr, LocalDirAllocator.SIZE_UNKNOWN, this.conf);
for (String str : command) {
// TODO: Should we instead work via symlinks without this grammar?
newCmds.add(str.replace(ApplicationConstants.LOG_DIR_EXPANSION_VAR,
@@ -129,9 +129,7 @@ public class ContainerLaunch implements
lDirAllocator.getLocalPathForWrite(
ResourceLocalizationService.NM_PRIVATE_DIR + Path.SEPARATOR
+ appIdStr + Path.SEPARATOR + containerIdStr
- + Path.SEPARATOR + CONTAINER_SCRIPT,
- LocalDirAllocator.SIZE_UNKNOWN,
- this.conf, false);
+ + Path.SEPARATOR + CONTAINER_SCRIPT, this.conf);
Path nmPrivateTokensPath =
lDirAllocator.getLocalPathForWrite(
ResourceLocalizationService.NM_PRIVATE_DIR
@@ -139,8 +137,7 @@ public class ContainerLaunch implements
+ containerIdStr
+ Path.SEPARATOR
+ String.format(ContainerLocalizer.TOKEN_FILE_NAME_FMT,
- containerIdStr), LocalDirAllocator.SIZE_UNKNOWN,
- this.conf, false);
+ containerIdStr), this.conf);
DataOutputStream containerScriptOutStream = null;
DataOutputStream tokensOutStream = null;
@@ -150,7 +147,7 @@ public class ContainerLaunch implements
+ Path.SEPARATOR + user + Path.SEPARATOR
+ ContainerLocalizer.APPCACHE + Path.SEPARATOR + appIdStr
+ Path.SEPARATOR + containerIdStr,
- LocalDirAllocator.SIZE_UNKNOWN, this.conf, false);
+ LocalDirAllocator.SIZE_UNKNOWN, this.conf);
try {
// /////////// Write out the container-script in the nmPrivate space.
String[] localDirs =
|