Move SecondaryNameNode.rollForwardByApplyingEdits to Checkpointer. Remove unused code in EditLogBackupInputStream

In response to Konstantin's review at:
https://issues.apache.org/jira/browse/HDFS-1073?focusedCommentId=13070021&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13070021


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

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

@@ -24,6 +24,7 @@ import static org.apache.hadoop.hdfs.server.common.Util.now;
 import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -39,6 +40,8 @@ import org.apache.hadoop.http.HttpServer;
 import org.apache.hadoop.io.MD5Hash;
 import org.apache.hadoop.util.Daemon;
 
+import com.google.common.collect.Lists;
+
 /**
  * The Checkpointer is responsible for supporting periodic checkpoints 
  * of the HDFS metadata.
@@ -240,7 +243,7 @@ class Checkpointer extends Daemon {
             backupNode.nnHttpAddress, log, bnStorage);
       }
   
-      SecondaryNameNode.rollForwardByApplyingLogs(manifest, bnImage);
+      rollForwardByApplyingLogs(manifest, bnImage);
     }
 
     long txid = bnImage.getLastAppliedTxId();
@@ -271,4 +274,22 @@ class Checkpointer extends Daemon {
     int httpPort = httpSocAddr.getPort();
     return new InetSocketAddress(infoBindAddress, httpPort);
   }
+
+  static void rollForwardByApplyingLogs(
+      RemoteEditLogManifest manifest,
+      FSImage dstImage) throws IOException {
+    NNStorage dstStorage = dstImage.getStorage();
+  
+    List<File> editsFiles = Lists.newArrayList();
+    for (RemoteEditLog log : manifest.getLogs()) {
+      File f = dstStorage.findFinalizedEditsFile(
+          log.getStartTxId(), log.getEndTxId());
+      if (log.getStartTxId() > dstImage.getLastAppliedTxId()) {
+        editsFiles.add(f);
+      }
+    }
+    LOG.info("Checkpointer about to load edits from " +
+        editsFiles.size() + " file(s).");
+    dstImage.loadEdits(editsFiles);
+  }
 }

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

@@ -42,10 +42,6 @@ class EditLogBackupInputStream extends EditLogInputStream {
       super(new byte[0]);
     }
 
-    byte[] getData() {
-      return super.buf;
-    }
-
     void setData(byte[] newBytes) {
       super.buf = newBytes;
       super.count = newBytes == null ? 0 : newBytes.length;

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

@@ -71,7 +71,6 @@ import org.apache.hadoop.util.StringUtils;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
 
 /**********************************************************
  * The Secondary NameNode is a helper to the primary NameNode.
@@ -854,26 +853,8 @@ public class SecondaryNameNode implements Runnable {
       dstImage.reloadFromImageFile(file);
     }
     
-    rollForwardByApplyingLogs(manifest, dstImage);
+    Checkpointer.rollForwardByApplyingLogs(manifest, dstImage);
     dstImage.saveFSImageInAllDirs(dstImage.getLastAppliedTxId());
     dstStorage.writeAll();
   }
-  
-  static void rollForwardByApplyingLogs(
-      RemoteEditLogManifest manifest,
-      FSImage dstImage) throws IOException {
-    NNStorage dstStorage = dstImage.getStorage();
-
-    List<File> editsFiles = Lists.newArrayList();
-    for (RemoteEditLog log : manifest.getLogs()) {
-      File f = dstStorage.findFinalizedEditsFile(
-          log.getStartTxId(), log.getEndTxId());
-      if (log.getStartTxId() > dstImage.getLastAppliedTxId()) {
-        editsFiles.add(f);
-      }
-    }
-    LOG.info("SecondaryNameNode about to load edits from " +
-        editsFiles.size() + " file(s).");
-    dstImage.loadEdits(editsFiles);
-  }
 }