hbase git commit: HBASE-15673 Fix latency metrics for multiGet. - Also fixes some stuff in help text. (Apekshit)

[st...@apache.org]

Repository: hbase
Updated Branches:
  refs/heads/master bd3b9753a -> 501030d20


HBASE-15673 Fix latency metrics for multiGet. - Also fixes some stuff in help text. (Apekshit)

Change-Id: I49d76896d5cc070b9f60dadf6746865e98fbbbd0

Signed-off-by: stack <st...@apache.org>


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

Branch: refs/heads/master
Commit: 501030d204d3418c015b739d6e7b85faacce6b7e
Parents: bd3b975
Author: Apekshit <ap...@gmail.com>
Authored: Mon Apr 18 15:56:42 2016 -0700
Committer: stack <st...@apache.org>
Committed: Tue Apr 19 16:12:43 2016 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/PerformanceEvaluation.java  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/501030d2/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
index fda3882..02b994a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
@@ -1143,7 +1143,12 @@ public class PerformanceEvaluation extends Configured implements Tool {
             scope.close();
           }
           if ( (i - startRow) > opts.measureAfter) {
-            latencyHistogram.update((System.nanoTime() - startTime) / 1000);
+            // If multiget is enabled, say set to 10, testRow() returns immediately first 9 times
+            // and sends the actual get request in the 10th iteration. We should only set latency
+            // when actual request is sent because otherwise it turns out to be 0.
+            if (opts.multiGet == 0 || (i - startRow + 1) % opts.multiGet == 0) {
+              latencyHistogram.update((System.nanoTime() - startTime) / 1000);
+            }
             if (status != null && i > 0 && (i % getReportingPeriod()) == 0) {
               status.setStatus(generateStatus(startRow, i, lastRow));
             }
@@ -1826,6 +1831,8 @@ public class PerformanceEvaluation extends Configured implements Tool {
         + DEFAULT_OPTS.getValueSize());
     System.err.println(" valueRandom     Set if we should vary value size between 0 and " +
         "'valueSize'; set on read for stats on size: Default: Not set.");
+    System.err.println(" blockEncoding   Block encoding to use. Value should be one of "
+        + Arrays.toString(DataBlockEncoding.values()) + ". Default: NONE");
     System.err.println();
     System.err.println("Table Creation / Write Tests:");
     System.err.println(" table           Alternate table name. Default: 'TestTable'");
@@ -1840,12 +1847,13 @@ public class PerformanceEvaluation extends Configured implements Tool {
         "'valueSize' in zipf form: Default: Not set.");
     System.err.println(" writeToWAL      Set writeToWAL on puts. Default: True");
     System.err.println(" autoFlush       Set autoFlush on htable. Default: False");
-    System.err.println(" presplit        Create presplit table. Recommended for accurate perf " +
-      "analysis (see guide).  Default: disabled");
+    System.err.println(" presplit        Create presplit table. If a table with same name exists,"
+        + " it'll be deleted and recreated (instead of verifying count of its existing regions). "
+        + "Recommended for accurate perf analysis (see guide). Default: disabled");
     System.err.println(" usetags         Writes tags along with KVs. Use with HFile V3. " +
       "Default: false");
     System.err.println(" numoftags       Specify the no of tags that would be needed. " +
-       "This works only if usetags is true.");
+       "This works only if usetags is true. Default: " + DEFAULT_OPTS.noOfTags);
     System.err.println(" splitPolicy     Specify a custom RegionSplitPolicy for the table.");
     System.err.println(" columns         Columns to write per row. Default: 1");
     System.err.println();