You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by to...@apache.org on 2011/07/25 22:38:33 UTC
svn commit: r1150896 - in /hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode: FSImageOldStorageInspector.java FSImagePreTransactionalStorageInspector.java NNStorage.java

Author: todd
Date: Mon Jul 25 20:38:32 2011
New Revision: 1150896

URL: http://svn.apache.org/viewvc?rev=1150896&view=rev
Log:
Rename FSImageOldStorageInspector to FSImagePreTransactionalStorageInspector.

Part of response to review by Konstantin.

Added:
    hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImagePreTransactionalStorageInspector.java
      - copied, changed from r1150882, hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImageOldStorageInspector.java
Removed:
    hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImageOldStorageInspector.java
Modified:
    hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java

Copied: hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImagePreTransactionalStorageInspector.java (from r1150882, hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImageOldStorageInspector.java)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImagePreTransactionalStorageInspector.java?p2=hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImagePreTransactionalStorageInspector.java&p1=hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImageOldStorageInspector.java&r1=1150882&r2=1150896&rev=1150896&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImageOldStorageInspector.java (original)
+++ hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImagePreTransactionalStorageInspector.java Mon Jul 25 20:38:32 2011
@@ -46,9 +46,9 @@ import org.apache.hadoop.hdfs.server.nam
  */
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
-class FSImageOldStorageInspector extends FSImageStorageInspector {
+class FSImagePreTransactionalStorageInspector extends FSImageStorageInspector {
   private static final Log LOG =
-    LogFactory.getLog(FSImageOldStorageInspector.class);
+    LogFactory.getLog(FSImagePreTransactionalStorageInspector.class);
   
   /* Flag if there is at least one storage dir that doesn't contain the newest
    * fstime */
@@ -169,7 +169,7 @@ class FSImageOldStorageInspector extends
                       "edits checkpoint time = " + latestEditsCheckpointTime);
     }
     
-    return new OldLoadPlan();
+    return new PreTransactionalLoadPlan();
   }
   
   @Override
@@ -180,7 +180,7 @@ class FSImageOldStorageInspector extends
 
   }
   
-  private class OldLoadPlan extends LoadPlan {
+  private class PreTransactionalLoadPlan extends LoadPlan {
 
     @Override
     boolean doRecovery() throws IOException {

Modified: hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java?rev=1150896&r1=1150895&r2=1150896&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java (original)
+++ hadoop/common/branches/HDFS-1073/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java Mon Jul 25 20:38:32 2011
@@ -1047,7 +1047,7 @@ public class NNStorage extends Storage i
         FSImage.LOG.warn("Ignoring one or more storage directories with old layouts");
       }
     } else {
-      inspector = new FSImageOldStorageInspector();
+      inspector = new FSImagePreTransactionalStorageInspector();
     }
     
     inspectStorageDirs(inspector);