hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sur...@apache.org
Subject svn commit: r1533246 - in /hadoop/common/branches/branch-1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImage.java
Date Thu, 17 Oct 2013 20:26:50 GMT
Author: suresh
Date: Thu Oct 17 20:26:49 2013
New Revision: 1533246

URL: http://svn.apache.org/r1533246
Log:
HDFS-5367. Restoring namenode storage locks namenode due to unnecessary fsimage write. Contributed
by John Zhao.

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

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1533246&r1=1533245&r2=1533246&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Thu Oct 17 20:26:49 2013
@@ -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. 

Modified: hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImage.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImage.java?rev=1533246&r1=1533245&r2=1533246&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImage.java
(original)
+++ hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImage.java
Thu Oct 17 20:26:49 2013
@@ -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());



Mime
View raw message