git commit: MAPREDUCE-5960. JobSubmitter's check whether job.jar is local is incorrect with no authority in job jar path. Contributed by Gera Shegalov (cherry picked from commit 10f9f5101c44be7c675a44

2014-11-06 Thread jlowe 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 5c8b55856 - c0bbb7291


MAPREDUCE-5960. JobSubmitter's check whether job.jar is local is incorrect with 
no authority in job jar path. Contributed by Gera Shegalov
(cherry picked from commit 10f9f5101c44be7c675a44ded4aad212627ecdee)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c0bbb729
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c0bbb729
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c0bbb729

Branch: refs/heads/branch-2
Commit: c0bbb72912b8e9c1de28bc82ba4b541cd0b222a8
Parents: 5c8b558
Author: Jason Lowe jl...@apache.org
Authored: Thu Nov 6 15:10:40 2014 +
Committer: Jason Lowe jl...@apache.org
Committed: Thu Nov 6 15:12:06 2014 +

--
 .../java/org/apache/hadoop/fs/FileContext.java  |  3 ++
 hadoop-mapreduce-project/CHANGES.txt|  3 ++
 .../v2/app/job/impl/TaskAttemptImpl.java|  8 ++--
 .../apache/hadoop/mapreduce/JobSubmitter.java   |  9 ++---
 .../org/apache/hadoop/mapred/YARNRunner.java|  5 ++-
 .../apache/hadoop/mapreduce/v2/TestMRJobs.java  | 41 
 .../apache/hadoop/mapreduce/v2/TestUberAM.java  | 40 +++
 7 files changed, 56 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0bbb729/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
index 57bd3b5..40d271d 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
@@ -440,6 +440,9 @@ public class FileContext {
   final Configuration aConf) throws UnsupportedFileSystemException {
 UserGroupInformation currentUser = null;
 AbstractFileSystem defaultAfs = null;
+if (defaultFsUri.getScheme() == null) {
+  return getFileContext(aConf);
+}
 try {
   currentUser = UserGroupInformation.getCurrentUser();
   defaultAfs = getAbstractFileSystem(currentUser, defaultFsUri, aConf);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0bbb729/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index e51dfb3..c9f9ed2 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -240,6 +240,9 @@ Release 2.6.0 - UNRELEASED
 MAPREDUCE-6048. Fixed TestJavaSerialization failure. (Varun Vasudev via
 jianhe)
 
+MAPREDUCE-5960. JobSubmitter's check whether job.jar is local is incorrect
+with no authority in job jar path. (Gera Shegalov via jlowe)
+
 Release 2.5.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0bbb729/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
index 58a8537..5a8a658 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
@@ -653,9 +653,11 @@ public abstract class TaskAttemptImpl implements
   //  Set up JobJar to be localized properly on the remote NM.
   String jobJar = conf.get(MRJobConfig.JAR);
   if (jobJar != null) {
-Path remoteJobJar = (new Path(jobJar)).makeQualified(remoteFS
-.getUri(), remoteFS.getWorkingDirectory());
-LocalResource rc = createLocalResource(remoteFS, remoteJobJar,
+final Path jobJarPath = new Path(jobJar);
+final FileSystem jobJarFs = FileSystem.get(jobJarPath.toUri(), conf);
+Path remoteJobJar = jobJarPath.makeQualified(jobJarFs.getUri(),
+jobJarFs.getWorkingDirectory());
+LocalResource rc = createLocalResource(jobJarFs, remoteJobJar,

git commit: MAPREDUCE-5960. JobSubmitter's check whether job.jar is local is incorrect with no authority in job jar path. Contributed by Gera Shegalov (cherry picked from commit 10f9f5101c44be7c675a44

2014-11-06 Thread jlowe 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.6 43854764a - 7be74ea09


MAPREDUCE-5960. JobSubmitter's check whether job.jar is local is incorrect with 
no authority in job jar path. Contributed by Gera Shegalov
(cherry picked from commit 10f9f5101c44be7c675a44ded4aad212627ecdee)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7be74ea0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7be74ea0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7be74ea0

Branch: refs/heads/branch-2.6
Commit: 7be74ea09a4721b39f78df47c11b9ceca1b34d1b
Parents: 4385476
Author: Jason Lowe jl...@apache.org
Authored: Thu Nov 6 15:10:40 2014 +
Committer: Jason Lowe jl...@apache.org
Committed: Thu Nov 6 15:12:37 2014 +

--
 .../java/org/apache/hadoop/fs/FileContext.java  |  3 ++
 hadoop-mapreduce-project/CHANGES.txt|  3 ++
 .../v2/app/job/impl/TaskAttemptImpl.java|  8 ++--
 .../apache/hadoop/mapreduce/JobSubmitter.java   |  9 ++---
 .../org/apache/hadoop/mapred/YARNRunner.java|  5 ++-
 .../apache/hadoop/mapreduce/v2/TestMRJobs.java  | 41 
 .../apache/hadoop/mapreduce/v2/TestUberAM.java  | 40 +++
 7 files changed, 56 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7be74ea0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
index 57bd3b5..40d271d 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
@@ -440,6 +440,9 @@ public class FileContext {
   final Configuration aConf) throws UnsupportedFileSystemException {
 UserGroupInformation currentUser = null;
 AbstractFileSystem defaultAfs = null;
+if (defaultFsUri.getScheme() == null) {
+  return getFileContext(aConf);
+}
 try {
   currentUser = UserGroupInformation.getCurrentUser();
   defaultAfs = getAbstractFileSystem(currentUser, defaultFsUri, aConf);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7be74ea0/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index bc70c89..bf758c4 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -225,6 +225,9 @@ Release 2.6.0 - UNRELEASED
 MAPREDUCE-6048. Fixed TestJavaSerialization failure. (Varun Vasudev via
 jianhe)
 
+MAPREDUCE-5960. JobSubmitter's check whether job.jar is local is incorrect
+with no authority in job jar path. (Gera Shegalov via jlowe)
+
 Release 2.5.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7be74ea0/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
index 58a8537..5a8a658 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
@@ -653,9 +653,11 @@ public abstract class TaskAttemptImpl implements
   //  Set up JobJar to be localized properly on the remote NM.
   String jobJar = conf.get(MRJobConfig.JAR);
   if (jobJar != null) {
-Path remoteJobJar = (new Path(jobJar)).makeQualified(remoteFS
-.getUri(), remoteFS.getWorkingDirectory());
-LocalResource rc = createLocalResource(remoteFS, remoteJobJar,
+final Path jobJarPath = new Path(jobJar);
+final FileSystem jobJarFs = FileSystem.get(jobJarPath.toUri(), conf);
+Path remoteJobJar = jobJarPath.makeQualified(jobJarFs.getUri(),
+jobJarFs.getWorkingDirectory());
+LocalResource rc = createLocalResource(jobJarFs, remoteJobJar,