Author: shv Date: Tue Jan 10 01:58:25 2012 New Revision: 1229448 URL: http://svn.apache.org/viewvc?rev=1229448&view=rev Log: HDFS-1910. NameNode should not save fsimage twice. Contributed by Konstantin Shvachko.
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=1229448&r1=1229447&r2=1229448&view=diff ============================================================================== --- hadoop/common/branches/branch-1/CHANGES.txt (original) +++ hadoop/common/branches/branch-1/CHANGES.txt Tue Jan 10 01:58:25 2012 @@ -81,6 +81,8 @@ Release 1.1.0 - unreleased HDFS-2728. Remove dfsadmin -printTopology from branch-1 docs since it does not exist. (harsh) + HDFS-1910. NameNode should not save fsimage twice. (shv) + IMPROVEMENTS MAPREDUCE-2517. Add system tests to Gridmix. (Vinay Thota via amarrk) 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=1229448&r1=1229447&r2=1229448&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 Tue Jan 10 01:58:25 2012 @@ -1113,6 +1113,8 @@ public class FSImage extends Storage { it.hasNext();) { StorageDirectory sd = it.next(); try { + if (sd.getStorageDirType().isOfType(NameNodeDirType.IMAGE_AND_EDITS)) + continue; // this has already been saved as IMAGE directory saveCurrent(sd); } catch(IOException ie) { LOG.error("Unable to save edits for " + sd.getRoot(), ie);