svn commit: r1077770 - in /hadoop/common/branches/branch-0.20-security-patches/src: mapred/org/apache/hadoop/mapred/JobClient.java tools/org/apache/hadoop/tools/DistCp.java

[omalley]

Author: omalley
Date: Fri Mar  4 04:53:31 2011
New Revision: 1077770

URL: http://svn.apache.org/viewvc?rev=1077770&view=rev
Log:
commit f94d6ac10cd8aea2971ce413acf16d1bb22d3b0c
Author: Krishna Ramachandran <ram...@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)
    +

Modified:
    
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobClient.java
    
hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/DistCp.java

Modified: 
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobClient.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobClient.java?rev=1077770&r1=1077769&r2=1077770&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobClient.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobClient.java
 Fri Mar  4 04:53:31 2011
@@ -624,7 +624,7 @@ public class JobClient extends Configure
     //
 
     // 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 Configure
           }
 
           // 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);

Modified: 
hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/DistCp.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/DistCp.java?rev=1077770&r1=1077769&r2=1077770&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/DistCp.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/DistCp.java
 Fri Mar  4 04:53:31 2011
@@ -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);