From 0d766544166fc9630bb00ae14a4a34a69d93f127 Mon Sep 17 00:00:00 2001 From: Lars Hofhansl Date: Thu, 19 Mar 2015 15:07:15 -0700 Subject: [PATCH] Reapply "HBASE-12976 Set default value for hbase.client.scanner.max.result.size." in 1.1 and 2.0 only This reverts commit 64589abe9936337fcbccdbe82e538d05020c8ee4. --- .../main/java/org/apache/hadoop/hbase/HConstants.java | 4 ++-- hbase-common/src/main/resources/hbase-default.xml | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java index 7d9390498ec..19e251ae805 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -624,9 +624,9 @@ public final class HConstants { * Note that when a single row is larger than this limit the row is still * returned completely. * - * The default value is unlimited. + * The default value is 2MB. */ - public static final long DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE = Long.MAX_VALUE; + public static final long DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE = 2 * 1024 * 1024; /** * Parameter name for client pause value, used mostly as value to wait diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index 69017f6ef56..a3092b54608 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -1289,6 +1289,16 @@ possible configurations would overwhelm and obscure the important. + + hbase.client.scanner.max.result.size + 2097152 + Maximum number of bytes returned when calling a scanner's next method. + Note that when a single row is larger than this limit the row is still returned completely. + The default value is 2MB, which is good for 1ge networks. + With faster and/or high latency networks this value should be increased. + + + hbase.status.published false