You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2016/10/24 13:37:31 UTC
hbase git commit: Revert "HBASE-16562 ITBLL should fail to start if
misconfigured"
Repository: hbase
Updated Branches:
refs/heads/branch-1.2 5bbaae522 -> 9fc3b94b6
Revert "HBASE-16562 ITBLL should fail to start if misconfigured"
This reverts commit a13f31aa7e83fd7b5ae6186f8ca9899427d0ef0d.
See discussion on JIRA.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9fc3b94b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9fc3b94b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9fc3b94b
Branch: refs/heads/branch-1.2
Commit: 9fc3b94b6704764980552feec15ad6191817fa05
Parents: 5bbaae5
Author: Sean Busbey <bu...@apache.org>
Authored: Mon Oct 24 08:35:50 2016 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Mon Oct 24 08:35:50 2016 -0500
----------------------------------------------------------------------
.../test/IntegrationTestBigLinkedList.java | 35 ++++++--------------
1 file changed, 10 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9fc3b94b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
index 880b13f..7f0f732 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
@@ -116,7 +116,6 @@ import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat;
import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl;
import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
-import org.jruby.RubyProcess;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -258,11 +257,6 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase {
public static final String MULTIPLE_UNEVEN_COLUMNFAMILIES_KEY =
"generator.multiple.columnfamilies";
- public static final String USAGE = "Usage : " + Generator.class.getSimpleName() +
- " <num mappers> <num nodes per map> <tmp output dir> [<width> <wrap multiplier> \n" +
- "where <num nodes per map> should be a multiple of width*wrap multiplier, " +
- "25M by default \n";
-
static class GeneratorInputFormat extends InputFormat<BytesWritable,NullWritable> {
static class GeneratorInputSplit extends InputSplit implements Writable {
@Override
@@ -504,20 +498,21 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase {
@Override
public int run(String[] args) throws Exception {
if (args.length < 3) {
- System.err.println(USAGE);
- return 1;
+ System.out.println("Usage : " + Generator.class.getSimpleName() +
+ " <num mappers> <num nodes per map> <tmp output dir> [<width> <wrap multiplier>]");
+ System.out.println(" where <num nodes per map> should be a multiple of " +
+ " width*wrap multiplier, 25M by default");
+ return 0;
}
int numMappers = Integer.parseInt(args[0]);
long numNodes = Long.parseLong(args[1]);
Path tmpOutput = new Path(args[2]);
Integer width = (args.length < 4) ? null : Integer.parseInt(args[3]);
- Integer wrapMultiplier = (args.length < 5) ? null : Integer.parseInt(args[4]);
- return run(numMappers, numNodes, tmpOutput, width, wrapMultiplier);
+ Integer wrapMuplitplier = (args.length < 5) ? null : Integer.parseInt(args[4]);
+ return run(numMappers, numNodes, tmpOutput, width, wrapMuplitplier);
}
-
-
protected void createSchema() throws IOException {
Configuration conf = getConf();
TableName tableName = getTableName(conf);
@@ -629,22 +624,12 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase {
}
public int run(int numMappers, long numNodes, Path tmpOutput,
- Integer width, Integer wrapMultiplier) throws Exception {
- long wrap = (long)width*wrapMultiplier;
- if (wrap < numNodes && numNodes % wrap != 0) {
- /**
- * numNodes should be a multiple of width*wrapMultiplier.
- * If numNodes less than wrap, wrap will be set to be equal with numNodes,
- * See {@link GeneratorMapper#setup(Mapper.Context)}
- * */
- System.err.println(USAGE);
- return 1;
- }
- int ret = runRandomInputGenerator(numMappers, numNodes, tmpOutput, width, wrapMultiplier);
+ Integer width, Integer wrapMuplitplier) throws Exception {
+ int ret = runRandomInputGenerator(numMappers, numNodes, tmpOutput, width, wrapMuplitplier);
if (ret > 0) {
return ret;
}
- return runGenerator(numMappers, numNodes, tmpOutput, width, wrapMultiplier);
+ return runGenerator(numMappers, numNodes, tmpOutput, width, wrapMuplitplier);
}
}