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

This commit is contained in:
chenheng 2016-09-07 15:29:55 +08:00
parent 78af20944c
commit 7363a76660
1 changed files with 10 additions and 11 deletions

View File

@ -676,17 +676,6 @@ 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());
@ -818,6 +807,16 @@ 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) {