svn commit: r1146864 - in /hadoop/common/branches/HDFS-1073/hdfs: CHANGES.HDFS-1073.txt src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java

[to...@apache.org]

Author: todd
Date: Thu Jul 14 19:25:17 2011
New Revision: 1146864

URL: http://svn.apache.org/viewvc?rev=1146864&view=rev
Log:
HDFS-2135. Fix regression of HDFS-1955 in HDFS-1073 branch. Contributed by Todd Lipcon.

Modified:
    hadoop/common/branches/HDFS-1073/hdfs/CHANGES.HDFS-1073.txt
    hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java

Modified: hadoop/common/branches/HDFS-1073/hdfs/CHANGES.HDFS-1073.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1073/hdfs/CHANGES.HDFS-1073.txt?rev=1146864&r1=1146863&r2=1146864&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1073/hdfs/CHANGES.HDFS-1073.txt (original)
+++ hadoop/common/branches/HDFS-1073/hdfs/CHANGES.HDFS-1073.txt Thu Jul 14 19:25:17 2011
@@ -74,3 +74,4 @@ HDFS-2133. Address remaining TODOs and p
 HDFS-1780. Reduce need to rewrite FSImage on startup. (todd)
 HDFS-2104. Add a flag to the 2NN to format its checkpoint dirs on startup.
            (todd)
+HDFS-2135. Fix regression of HDFS-1955 in HDFS-1073 branch. (todd)

Modified: hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java?rev=1146864&r1=1146863&r2=1146864&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java (original)
+++ hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java Thu Jul 14 19:25:17 2011
@@ -408,11 +408,13 @@ public class FSImage implements Closeabl
       }
       LOG.info("Upgrade of " + sd.getRoot() + " is complete.");
     }
+    storage.reportErrorsOnDirectories(errorSDs);
+
     isUpgradeFinalized = false;
-    if (!errorSDs.isEmpty()) {
-      storage.reportErrorsOnDirectories(errorSDs);
+    if (!storage.getRemovedStorageDirs().isEmpty()) {
       //during upgrade, it's a fatal error to fail any storage directory
-      throw new IOException("Upgrade failed in " + errorSDs.size()
+      throw new IOException("Upgrade failed in "
+          + storage.getRemovedStorageDirs().size()
           + " storage directory(ies), previously logged.");
     }
     storage.initializeDistributedUpgrade();