Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 13525 invoked from network); 4 Dec 2008 21:59:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Dec 2008 21:59:52 -0000 Received: (qmail 35285 invoked by uid 500); 4 Dec 2008 22:00:04 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 35113 invoked by uid 500); 4 Dec 2008 22:00:04 -0000 Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: core-dev@hadoop.apache.org Delivered-To: mailing list core-commits@hadoop.apache.org Received: (qmail 35103 invoked by uid 99); 4 Dec 2008 22:00:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Dec 2008 14:00:04 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Dec 2008 21:58:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2305223888A0; Thu, 4 Dec 2008 13:59:01 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r723462 - in /hadoop/core/branches/branch-0.18: ./ CHANGES.txt src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java src/mapred/org/apache/hadoop/mapred/FileOutputFormat.java Date: Thu, 04 Dec 2008 21:59:00 -0000 To: core-commits@hadoop.apache.org From: hairong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081204215901.2305223888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hairong Date: Thu Dec 4 13:59:00 2008 New Revision: 723462 URL: http://svn.apache.org/viewvc?rev=723462&view=rev Log: Merge -r 723459:723460 from main to move the change log of HADOOP-4746 to branch 0.18. Modified: hadoop/core/branches/branch-0.18/ (props changed) hadoop/core/branches/branch-0.18/CHANGES.txt (contents, props changed) hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/FileOutputFormat.java Propchange: hadoop/core/branches/branch-0.18/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 4 13:59:00 2008 @@ -1,2 +1,2 @@ /hadoop/core/branches/branch-0.19:704733 -/hadoop/core/trunk:699517,700163,704701,704732,705420,705430,707258,709040,720602 +/hadoop/core/trunk:699517,700163,704701,704732,705420,705430,707258,709040,720602,723460 Modified: hadoop/core/branches/branch-0.18/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=723462&r1=723461&r2=723462&view=diff ============================================================================== --- hadoop/core/branches/branch-0.18/CHANGES.txt (original) +++ hadoop/core/branches/branch-0.18/CHANGES.txt Thu Dec 4 13:59:00 2008 @@ -69,6 +69,8 @@ HADOOP-4734. Block and meta data validation codes in HADOOP-1700 should be committed to 0.18. (szetszwo) + HADOOP-4746. Job output directory should be normalized. (hairong) + Release 0.18.2 - 2008-11-03 BUG FIXES Propchange: hadoop/core/branches/branch-0.18/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 4 13:59:00 2008 @@ -1 +1 @@ -/hadoop/core/trunk/CHANGES.txt:699517,700163,700923,704701,705420,705430,707258,709040,720602 +/hadoop/core/trunk/CHANGES.txt:699517,700163,700923,704701,705420,705430,707258,709040,720602,723460 Modified: hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java?rev=723462&r1=723461&r2=723462&view=diff ============================================================================== --- hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java (original) +++ hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java Thu Dec 4 13:59:00 2008 @@ -3189,8 +3189,8 @@ // // Modify the blocks->datanode map and node's map. // - addStoredBlock(block, node, delHintNode ); pendingReplications.remove(block); + addStoredBlock(block, node, delHintNode ); } long[] getStats() throws IOException { Modified: hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/FileOutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/FileOutputFormat.java?rev=723462&r1=723461&r2=723462&view=diff ============================================================================== --- hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/FileOutputFormat.java (original) +++ hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/FileOutputFormat.java Thu Dec 4 13:59:00 2008 @@ -100,9 +100,16 @@ if (outDir == null && job.getNumReduceTasks() != 0) { throw new InvalidJobConfException("Output directory not set in JobConf."); } - if (outDir != null && outDir.getFileSystem(job).exists(outDir)) { - throw new FileAlreadyExistsException("Output directory " + outDir + - " already exists"); + if (outDir != null) { + FileSystem fs = outDir.getFileSystem(job); + // normalize the output directory + outDir = fs.makeQualified(outDir); + setOutputPath(job, outDir); + // check its existence + if (fs.exists(outDir)) { + throw new FileAlreadyExistsException("Output directory " + outDir + + " already exists"); + } } }