Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-9569 TestHLog is broken 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1524294 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-09-18 05:08:59 +00:00
parent de3d34bd4a
commit d36860258e
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java
View File

@ -28,6 +28,7 @@ import java.util.UUID;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured; import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;
@ -128,6 +129,7 @@ public final class HLogPerformanceEvaluation extends Configured implements Tool
boolean verify = false; boolean verify = false;
boolean verbose = false; boolean verbose = false;
boolean cleanup = true; boolean cleanup = true;
boolean noclosefs = false;
long roll = Long.MAX_VALUE; long roll = Long.MAX_VALUE;
// Process command line args // Process command line args
for (int i = 0; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
@ -155,6 +157,8 @@ public final class HLogPerformanceEvaluation extends Configured implements Tool
verbose = true; verbose = true;
} else if (cmd.equals("-nocleanup")) { } else if (cmd.equals("-nocleanup")) {
cleanup = false; cleanup = false;
} else if (cmd.equals("-noclosefs")) {
noclosefs = true;
} else if (cmd.equals("-roll")) { } else if (cmd.equals("-roll")) {
roll = Long.parseLong(args[++i]); roll = Long.parseLong(args[++i]);
} else if (cmd.equals("-h")) { } else if (cmd.equals("-h")) {
@ -231,7 +235,8 @@ public final class HLogPerformanceEvaluation extends Configured implements Tool
if (cleanup) cleanRegionRootDir(fs, rootRegionDir); if (cleanup) cleanRegionRootDir(fs, rootRegionDir);
} }
} finally { } finally {
fs.close(); // We may be called inside a test that wants to keep on using the fs.
if (!noclosefs) fs.close();
} }
return(0); return(0);
@ -297,6 +302,7 @@ public final class HLogPerformanceEvaluation extends Configured implements Tool
System.err.println(" -keySize <N> Row key size in byte."); System.err.println(" -keySize <N> Row key size in byte.");
System.err.println(" -valueSize <N> Row/Col value size in byte."); System.err.println(" -valueSize <N> Row/Col value size in byte.");
System.err.println(" -nocleanup Do NOT remove test data when done."); System.err.println(" -nocleanup Do NOT remove test data when done.");
System.err.println(" -noclosefs Do NOT close the filesystem when done.");
System.err.println(" -nosync Append without syncing"); System.err.println(" -nosync Append without syncing");
System.err.println(" -verify Verify edits written in sequence"); System.err.println(" -verify Verify edits written in sequence");
System.err.println(" -verbose Output extra info; e.g. all edit seq ids when verifying"); System.err.println(" -verbose Output extra info; e.g. all edit seq ids when verifying");
@ -372,11 +378,11 @@ public final class HLogPerformanceEvaluation extends Configured implements Tool
* @return errCode * @return errCode
* @throws Exception * @throws Exception
*/ */
static int innerMain(final String [] args) throws Exception { static int innerMain(final Configuration c, final String [] args) throws Exception {
return ToolRunner.run(HBaseConfiguration.create(), new HLogPerformanceEvaluation(), args); return ToolRunner.run(c, new HLogPerformanceEvaluation(), args);
} }
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
System.exit(innerMain(args)); System.exit(innerMain(HBaseConfiguration.create(), args));
} }
} }

5
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
View File

@ -145,8 +145,9 @@ public class TestHLog {
// Run the HPE tool with three threads writing 3000 edits each concurrently. // Run the HPE tool with three threads writing 3000 edits each concurrently.
// When done, verify that all edits were written and that the order in the // When done, verify that all edits were written and that the order in the
// WALs is of ascending edit sequence ids. // WALs is of ascending edit sequence ids.
int errCode = int errCode = HLogPerformanceEvaluation.
HLogPerformanceEvaluation.innerMain(new String [] {"-threads", "3", "-verify", "-iterations", "3000"}); innerMain(new Configuration(TEST_UTIL.getConfiguration()),
new String [] {"-threads", "3", "-verify", "-noclosefs", "-iterations", "3000"});
assertEquals(0, errCode); assertEquals(0, errCode);
} }