hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject [2/2] hbase git commit: HBASE-16934 Revert ITBLL misconfiguration check that results in NPE.
Date Mon, 24 Oct 2016 14:27:52 GMT
HBASE-16934 Revert ITBLL misconfiguration check that results in NPE.

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

This reverts commit 66a82af9f47230b1972a32bea50beb785fb7997a.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f475e54b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f475e54b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f475e54b

Branch: refs/heads/0.98
Commit: f475e54bef96a3817e4807c8bd21f841d1492b2a
Parents: 09b89ee
Author: Sean Busbey <busbey@apache.org>
Authored: Mon Oct 24 09:26:21 2016 -0500
Committer: Sean Busbey <busbey@apache.org>
Committed: Mon Oct 24 09:26:21 2016 -0500

----------------------------------------------------------------------
 .../test/IntegrationTestBigLinkedList.java      | 34 ++++++--------------
 1 file changed, 10 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/f475e54b/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 8f7539b..d0df043 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
@@ -218,11 +218,6 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase
{
 
     private static final Log LOG = LogFactory.getLog(Generator.class);
 
-    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
@@ -439,20 +434,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();
       HBaseAdmin admin = new HBaseAdmin(conf);
@@ -553,22 +549,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);
     }
   }
 


Mime
View raw message