HDFS-2135. Fix regression of HDFS-1955 in HDFS-1073 branch. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1073@1146864 13f79535-47bb-0310-9956-ffa450edef68

hdfs/CHANGES.HDFS-1073.txt

@@ -74,3 +74,4 @@ HDFS-2133. Address remaining TODOs and pre-merge cleanup on HDFS-1073 branch.
 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)

hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java

@@ -408,11 +408,13 @@ public class FSImage implements Closeable {
       }
       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();