Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 72506 invoked from network); 26 Jun 2006 20:50:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Jun 2006 20:50:18 -0000 Received: (qmail 20976 invoked by uid 500); 26 Jun 2006 20:50:17 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 20930 invoked by uid 500); 26 Jun 2006 20:50:17 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 20919 invoked by uid 99); 26 Jun 2006 20:50:17 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jun 2006 13:50:17 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jun 2006 13:50:16 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 843C21A983A; Mon, 26 Jun 2006 13:49:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r417295 - /lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java Date: Mon, 26 Jun 2006 20:49:56 -0000 To: hadoop-commits@lucene.apache.org From: cutting@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060626204956.843C21A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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); }