Revert "HBASE-16562 ITBLL should fail to start if misconfigured, addendum"

This reverts commit 7363a76660.

See discussion on JIRA.
This commit is contained in:
Sean Busbey 2016-10-24 09:18:55 -05:00
parent 3584537b07
commit 57184f446d
1 changed files with 11 additions and 10 deletions

View File

@ -676,6 +676,17 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase {
Integer width = (args.length < 4) ? null : Integer.parseInt(args[3]); Integer width = (args.length < 4) ? null : Integer.parseInt(args[3]);
Integer wrapMultiplier = (args.length < 5) ? null : Integer.parseInt(args[4]); Integer wrapMultiplier = (args.length < 5) ? null : Integer.parseInt(args[4]);
Integer numWalkers = (args.length < 6) ? null : Integer.parseInt(args[5]); 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); return run(numMappers, numNodes, tmpOutput, width, wrapMultiplier, numWalkers);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
System.err.println("Parsing generator arguments failed: " + e.getMessage()); System.err.println("Parsing generator arguments failed: " + e.getMessage());
@ -807,16 +818,6 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase {
public int run(int numMappers, long numNodes, Path tmpOutput, public int run(int numMappers, long numNodes, Path tmpOutput,
Integer width, Integer wrapMultiplier, Integer numWalkers) Integer width, Integer wrapMultiplier, Integer numWalkers)
throws Exception { 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, int ret = runRandomInputGenerator(numMappers, numNodes, tmpOutput, width, wrapMultiplier,
numWalkers); numWalkers);
if (ret > 0) { if (ret > 0) {