HDFS-5367. Restoring namenode storage locks namenode due to unnecessary fsimage write. Contributed by John Zhao.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1533246 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -43,6 +43,9 @@ Release 1.3.0 - unreleased
     HDFS-5245. shouldRetry() in WebHDFSFileSystem generates excessive warnings.
     (Haohui Mai via jing9)
 
+    HDFS-5367. Restoring namenode storage locks namenode due to unnecessary
+    fsimage write. (Jonh Zhao via suresh)
+
   BUG FIXES
 
     HADOOP-9863. Backport HADOOP-8686 to support BigEndian on ppc64. 

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

@@ -1308,12 +1308,9 @@ public class FSImage extends Storage {
 
         if (sd.getStorageDirType().equals(NameNodeDirType.EDITS)) {
           restoreFile(goodEdits, sd.getCurrentDir(), NameNodeFile.EDITS.getName());
-        } else if (sd.getStorageDirType().equals(NameNodeDirType.IMAGE)) {
-          restoreFile(goodImage, sd.getCurrentDir(), NameNodeFile.IMAGE.getName());
         } else if (sd.getStorageDirType().equals(
             NameNodeDirType.IMAGE_AND_EDITS)) {
-          restoreFile(goodEdits, sd.getCurrentDir(), NameNodeFile.EDITS.getName());
-          restoreFile(goodImage, sd.getCurrentDir(), NameNodeFile.IMAGE.getName());
+          restoreFile(goodEdits, sd.getCurrentDir(), NameNodeFile.EDITS.getName());          
         } else {
           throw new IOException("Invalid NameNodeDirType: "
               + sd.getStorageDirType());