Explorar el Código

commit f94d6ac10cd8aea2971ce413acf16d1bb22d3b0c
Author: Krishna Ramachandran <ramach@yahoo-inc.com>
Date: Mon Dec 20 09:41:52 2010 -0800

Fix Ticket 3963156

+++ b/YAHOO-CHANGES.txt
+ - Mapred does not pick up viewfs as default FS when defined in
+core-site.xml (Krishna Ramachandran)
+


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-patches@1077770 13f79535-47bb-0310-9956-ffa450edef68

Owen O'Malley hace 14 años
padre
commit
503e885ab4

+ 2 - 1
src/mapred/org/apache/hadoop/mapred/JobClient.java

@@ -624,7 +624,7 @@ public class JobClient extends Configured implements MRConstants, Tool  {
     //
 
     // Create a number of filenames in the JobTracker's fs namespace
-    FileSystem fs = getFs();
+    FileSystem fs = submitJobDir.getFileSystem(job);
     LOG.debug("default FileSystem: " + fs.getUri());
     if (fs.exists(submitJobDir)) {
       throw new IOException("Not submitting job. Job directory " + submitJobDir
@@ -834,6 +834,7 @@ public class JobClient extends Configured implements MRConstants, Tool  {
           }
 
           // Create the splits for the job
+          FileSystem fs = submitJobDir.getFileSystem(jobCopy);
           LOG.debug("Creating splits at " + fs.makeQualified(submitJobDir));
           int maps = writeSplits(context, submitJobDir);
           jobCopy.setNumMapTasks(maps);

+ 2 - 1
src/tools/org/apache/hadoop/tools/DistCp.java

@@ -1023,7 +1023,8 @@ public class DistCp implements Tool {
     Path jobDirectory = new Path(stagingArea + NAME + "_" + randomId);
     FsPermission mapredSysPerms =
       new FsPermission(JobSubmissionFiles.JOB_DIR_PERMISSION);
-    FileSystem.mkdirs(jClient.getFs(), jobDirectory, mapredSysPerms);
+    // FileSystem.mkdirs(jClient.getFs(), jobDirectory, mapredSysPerms);
+    FileSystem.mkdirs(FileSystem.get(jobDirectory.toUri(),conf), jobDirectory, mapredSysPerms);
     jobConf.set(JOB_DIR_LABEL, jobDirectory.toString());
 
     FileSystem dstfs = args.dst.getFileSystem(conf);