Repository: hbase
Updated Branches:
  refs/heads/0.98 afe33d1db -> d50aecec5
  refs/heads/branch-1 58b943a84 -> af7b5fa94
  refs/heads/branch-1.0 8e938de75 -> e8a51c07c
  refs/heads/master 96cdc7987 -> 2583e8de5


HBASE-12976 Set default value for hbase.client.scanner.max.result.size.


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

Branch: refs/heads/master
Commit: 2583e8de574ae4b002c5dbc80b0da666b42dd699
Parents: 96cdc79
Author: Lars Hofhansl <[email protected]>
Authored: Thu Feb 5 13:29:23 2015 -0800
Committer: Lars Hofhansl <[email protected]>
Committed: Thu Feb 5 13:29:23 2015 -0800

----------------------------------------------------------------------
 .../src/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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/2583e8de/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
----------------------------------------------------------------------
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 49bb7e1..2ee55f7 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
@@ -611,9 +611,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

http://git-wip-us.apache.org/repos/asf/hbase/blob/2583e8de/hbase-common/src/main/resources/hbase-default.xml
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/resources/hbase-default.xml 
b/hbase-common/src/main/resources/hbase-default.xml
index e412b8f..2985685 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -1259,6 +1259,16 @@ possible configurations would overwhelm and obscure the 
important.
   </property>
 
   <property>
+    <name>hbase.client.scanner.max.result.size</name>
+    <value>2097152</value>
+    <description>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.
+    </description>
+  </property>
+
+  <property>
     <name>hbase.status.published</name>
     <value>false</value>
     <description>

Reply via email to