svn commit: r417295 - /lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java

[cu...@apache.org]

Author: cutting
Date: Mon Jun 26 13:49:55 2006
New Revision: 417295

URL: http://svn.apache.org/viewvc?rev=417295&view=rev
Log:
Fix a bug in the fix for HADOOP-278.  Input directories should be
checked against the job's filesystem, not the jobtracker's.
Contributed by Owen.

Modified:
    lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java?rev=417295&r1=417294&r2=417295&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java Mon Jun 26 13:49:55 2006
@@ -242,7 +242,6 @@
 
         String originalJarPath = job.getJar();
 
-        FileSystem localFs = FileSystem.getNamed("local", job);
         FileSystem fs = getFs();
 
         short replication = (short)job.getInt("mapred.submit.replication", 10);
@@ -260,12 +259,14 @@
           job.setWorkingDirectory(fs.getWorkingDirectory());          
         }
 
+        FileSystem userFileSys = FileSystem.get(job);
         Path[] inputDirs = job.getInputPaths();
         boolean[] validDirs = 
-          job.getInputFormat().areValidInputDirectories(fs, inputDirs);
+          job.getInputFormat().areValidInputDirectories(userFileSys, inputDirs);
         for(int i=0; i < validDirs.length; ++i) {
           if (!validDirs[i]) {
-            String msg = "Input directory " + inputDirs[i] + " is invalid.";
+            String msg = "Input directory " + inputDirs[i] + 
+                         " in " + userFileSys.getName() + " is invalid.";
             LOG.error(msg);
             throw new IOException(msg);
           }