Return-Path: Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: (qmail 99975 invoked from network); 7 Jan 2011 06:50:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Jan 2011 06:50:47 -0000 Received: (qmail 16730 invoked by uid 500); 7 Jan 2011 06:50:47 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 16640 invoked by uid 500); 7 Jan 2011 06:50:46 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 16632 invoked by uid 99); 7 Jan 2011 06:50:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jan 2011 06:50:46 +0000 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; Fri, 07 Jan 2011 06:50:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7E91C23888E7; Fri, 7 Jan 2011 06:50:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1056208 - in /hadoop/hdfs/branches/branch-0.22: CHANGES.txt src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java Date: Fri, 07 Jan 2011 06:50:25 -0000 To: hdfs-commits@hadoop.apache.org From: todd@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110107065025.7E91C23888E7@eris.apache.org> Author: todd Date: Fri Jan 7 06:50:25 2011 New Revision: 1056208 URL: http://svn.apache.org/viewvc?rev=1056208&view=rev Log: HDFS-1504. FSImageSaver should catch all exceptions, not just IOE. Contributed by Todd Lipcon Modified: hadoop/hdfs/branches/branch-0.22/CHANGES.txt hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java Modified: hadoop/hdfs/branches/branch-0.22/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/CHANGES.txt?rev=1056208&r1=1056207&r2=1056208&view=diff ============================================================================== --- hadoop/hdfs/branches/branch-0.22/CHANGES.txt (original) +++ hadoop/hdfs/branches/branch-0.22/CHANGES.txt Fri Jan 7 06:50:25 2011 @@ -423,6 +423,8 @@ Release 0.22.0 - Unreleased HDFS-1542. Add test for HADOOP-7082, a deadlock writing Configuration to HDFS. (todd) + HDFS-1504. FSImageSaver should catch all exceptions, not just IOE. (todd) + Release 0.21.1 - Unreleased IMPROVEMENTS Modified: hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java?rev=1056208&r1=1056207&r2=1056208&view=diff ============================================================================== --- hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java (original) +++ hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java Fri Jan 7 06:50:25 2011 @@ -1138,9 +1138,9 @@ public class FSImage extends Storage { public void run() { try { saveCurrent(sd); - } catch (IOException ie) { - LOG.error("Unable to save image for " + sd.getRoot(), ie); - errorSDs.add(sd); + } catch (Throwable t) { + LOG.error("Unable to save image for " + sd.getRoot(), t); + errorSDs.add(sd); } }