Author: llu
Date: Thu Jul 7 01:49:14 2011
New Revision: 1143626
URL: http://svn.apache.org/viewvc?rev=1143626&view=rev
Log:
Reinstate resolve path fixes for viewfs. (Siddharth Seth via llu)
Modified:
hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.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=1143626&r1=1143625&r2=1143626&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/MR-279/mapreduce/CHANGES.txt Thu Jul 7 01:49:14 2011
@@ -5,6 +5,8 @@ Trunk (unreleased changes)
MAPREDUCE-279
+ Reinstate resolve path fixes for viewfs. (Siddharth Seth via llu)
+
Major ASM cleanup. Streamlining classes, interface and events. (vinodkv)
(1) Faster retries from AM to HistoryServer (2) Correct diagnostics for
Modified:
hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java?rev=1143626&r1=1143625&r2=1143626&view=diff
==============================================================================
---
hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
(original)
+++
hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
Thu Jul 7 01:49:14 2011
@@ -488,7 +488,8 @@ public abstract class TaskAttemptImpl im
FileStatus fstat = fc.getFileStatus(file);
LocalResource resource =
recordFactory.newRecordInstance(LocalResource.class);
- resource.setResource(ConverterUtils.getYarnUrlFromPath(fstat.getPath()));
+ resource.setResource(ConverterUtils.getYarnUrlFromPath(fc.resolvePath(fstat
+ .getPath())));
resource.setType(type);
resource.setVisibility(visibility);
resource.setSize(fstat.getLen());
@@ -678,14 +679,16 @@ public abstract class TaskAttemptImpl im
Map<String, Path> classPaths = new HashMap<String, Path>();
if (pathsToPutOnClasspath != null) {
for (Path p : pathsToPutOnClasspath) {
- p =
p.makeQualified(remoteFS.getUri(),remoteFS.getWorkingDirectory());
+ p = remoteFS.resolvePath(p.makeQualified(remoteFS.getUri(),
+ remoteFS.getWorkingDirectory()));
classPaths.put(p.toUri().getPath().toString(), p);
}
}
for (int i = 0; i < uris.length; ++i) {
URI u = uris[i];
Path p = new Path(u);
- p = p.makeQualified(remoteFS.getUri(), remoteFS.getWorkingDirectory());
+ p = remoteFS.resolvePath(p.makeQualified(remoteFS.getUri(),
+ remoteFS.getWorkingDirectory()));
// Add URI fragment or just the filename
Path name = new Path((null == u.getFragment())
? p.getName()
