Repository: hbase Updated Branches: refs/heads/branch-1 d76cc4c1f -> a1536c287
Revert "HBASE-16562 ITBLL should fail to start if misconfigured, addendum" This reverts commit 6f73ef2dff46692ede976621f3e4b9e5cfae01fa. 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/65c2dd48 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/65c2dd48 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/65c2dd48 Branch: refs/heads/branch-1 Commit: 65c2dd489f2c1773c9e253fb950daf223eb9a154 Parents: d76cc4c Author: Sean Busbey <bus...@apache.org> Authored: Mon Oct 24 09:16:40 2016 -0500 Committer: Sean Busbey <bus...@apache.org> Committed: Mon Oct 24 09:16:40 2016 -0500 ---------------------------------------------------------------------- .../test/IntegrationTestBigLinkedList.java | 21 ++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/65c2dd48/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 87ac1f7..366fc02 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 @@ -678,6 +678,17 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase { Integer width = (args.length < 4) ? null : Integer.parseInt(args[3]); Integer wrapMultiplier = (args.length < 5) ? null : Integer.parseInt(args[4]); Integer numWalkers = (args.length < 6) ? null : Integer.parseInt(args[5]); + + 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; + } return run(numMappers, numNodes, tmpOutput, width, wrapMultiplier, numWalkers); } catch (NumberFormatException e) { System.err.println("Parsing generator arguments failed: " + e.getMessage()); @@ -802,16 +813,6 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase { public int run(int numMappers, long numNodes, Path tmpOutput, Integer width, Integer wrapMultiplier, Integer numWalkers) 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, numWalkers); if (ret > 0) {
