Forráskód Böngészése

HDFS-2160. Fix CreateEditsLog test tool in HDFS-1073 branch. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1073@1148070 13f79535-47bb-0310-9956-ffa450edef68
Todd Lipcon 14 éve
szülő
commit
ed13ee354d

+ 1 - 0
hdfs/CHANGES.HDFS-1073.txt

@@ -75,3 +75,4 @@ HDFS-1780. Reduce need to rewrite FSImage on startup. (todd)
 HDFS-2104. Add a flag to the 2NN to format its checkpoint dirs on startup.
            (todd)
 HDFS-2135. Fix regression of HDFS-1955 in HDFS-1073 branch. (todd)
+HDFS-2160. Fix CreateEditsLog test tool in HDFS-1073 branch. (todd)

+ 1 - 3
hdfs/bin/hdfs

@@ -106,9 +106,7 @@ elif [ "$COMMAND" = "getconf" ] ; then
 elif [ "$COMMAND" = "groups" ] ; then
   CLASS=org.apache.hadoop.hdfs.tools.GetGroups
 else
-  echo $COMMAND - invalid command
-  print_usage
-  exit
+  CLASS="$COMMAND"
 fi
 
 # for developers, add hdfs classes to CLASSPATH

+ 2 - 6
hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java

@@ -195,13 +195,9 @@ public class CreateEditsLog {
     }
     
 
-    FSImage fsImage = null;
-    /* TODO new FSImage(editsLogDir.getAbsoluteFile().toURI());*/
     FileNameGenerator nameGenerator = new FileNameGenerator(BASE_PATH, 100);
-
-    FSEditLog editLog = fsImage.getEditLog();
-    // TODO editLog.reset();
-    // TODOeditLog.open();
+    FSEditLog editLog = FSImageTestUtil.createStandaloneEditLog(editsLogDir);
+    editLog.open();
     addFiles(editLog, numFiles, replication, numBlocksPerFile, startingBlockId,
              nameGenerator);
     editLog.logSync();