hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject svn commit: r1225336 - in /hadoop/common/branches/branch-0.22/hdfs: CHANGES.txt src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java
Date Wed, 28 Dec 2011 21:06:54 GMT
Author: shv
Date: Wed Dec 28 21:06:54 2011
New Revision: 1225336

URL: http://svn.apache.org/viewvc?rev=1225336&view=rev
Log:
Revert. Refers to wrong jira HDFS-1910. 

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

Modified: hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt?rev=1225336&r1=1225335&r2=1225336&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt Wed Dec 28 21:06:54 2011
@@ -12,8 +12,6 @@ Release 0.22.1 - Unreleased
 
   BUG FIXES
 
-    HDFS-1910. NameNdoe should not save fsimage twice. (shv)
-
 Release 0.22.0 - 2011-11-29
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java?rev=1225336&r1=1225335&r2=1225336&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
(original)
+++ hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
Wed Dec 28 21:06:54 2011
@@ -1421,7 +1421,7 @@ public class FSImage extends Storage {
   void rollFSImage(CheckpointSignature sig, 
       boolean renewCheckpointTime) throws IOException {
     sig.validateStorageInfo(this);
-    rollFSImage(renewCheckpointTime);
+    rollFSImage(true);
   }
 
   private void rollFSImage(boolean renewCheckpointTime)

Modified: hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java?rev=1225336&r1=1225335&r2=1225336&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java
(original)
+++ hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java
Wed Dec 28 21:06:54 2011
@@ -155,18 +155,6 @@ public class TestBackupNode {
           THIS_HOST + ":0");
       backup = startBackupNode(conf, op, 1);
       waitCheckpointDone(backup);
-
-      // Verify fstime files are identical in case of BN and not in case of CN
-      FSImage imageNN = cluster.getNameNode().getFSImage();
-      long cpTimeNN = imageNN.readCheckpointTime(imageNN.dirIterator().next());
-      FSImage imageBN = backup.getFSImage();
-      long cpTimeBN = imageBN.readCheckpointTime(imageBN.dirIterator().next());
-      assertTrue(
-          op == StartupOption.BACKUP ?
-              "NN should have the same checkpointTime as BN" :
-                "NN should have different checkpointTime from CN", 
-          op == StartupOption.BACKUP && cpTimeNN == cpTimeBN ||
-          op == StartupOption.CHECKPOINT && cpTimeNN != cpTimeBN);
     } catch(IOException e) {
       LOG.error("Error in TestBackupNode:", e);
       assertTrue(e.getLocalizedMessage(), false);



Mime
View raw message