Return-Path: 
 <commits-return-32827-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CF4F118089
	for <apmail-hbase-commits-archive@www.apache.org>;
 Fri, 26 Feb 2016 21:54:55 +0000 (UTC)
Received: (qmail 28642 invoked by uid 500); 26 Feb 2016 21:54:55 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 28602 invoked by uid 500); 26 Feb 2016 21:54:55 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 28593 invoked by uid 99); 26 Feb 2016 21:54:55 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Feb 2016 21:54:55 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 410ABE0211; Fri, 26 Feb 2016 21:54:55 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: stack@apache.org
To: commits@hbase.apache.org
Message-Id: <fe678526af2c4f1393c6326a2a97d516@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: hbase git commit: HBASE-15351 Fix description of
 hbase.bucketcache.size in hbase-default.xml
Date: Fri, 26 Feb 2016 21:54:55 +0000 (UTC)

Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 6cb16e93d -> 41efb9233


HBASE-15351 Fix description of hbase.bucketcache.size in hbase-default.xml


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

Branch: refs/heads/branch-1.1
Commit: 41efb9233729dd755b712cf6b496afeffc51b957
Parents: 6cb16e9
Author: stack <stack@apache.org>
Authored: Fri Feb 26 13:49:26 2016 -0800
Committer: stack <stack@apache.org>
Committed: Fri Feb 26 13:54:46 2016 -0800

----------------------------------------------------------------------
 .../src/main/resources/hbase-default.xml        | 36 +++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/41efb923/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 2b3c48b..80fe1a8 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -783,6 +783,40 @@ possible configurations would overwhelm and obscure the important.
           block is written out and a new block is started.</description>
   </property>
   <property>
+    <name>hbase.bucketcache.ioengine</name>
+    <value></value>
+    <description>Where to store the contents of the bucketcache. One of: heap,
+    offheap, or file. If a file, set it to file:PATH_TO_FILE. See
+    http://hbase.apache.org/book.html#offheap.blockcache for more information.
+    </description>
+  </property>
+  <property>
+    <name>hbase.bucketcache.combinedcache.enabled</name>
+    <value>true</value>
+    <description>Whether or not the bucketcache is used in league with the LRU
+    on-heap block cache. In this mode, indices and blooms are kept in the LRU
+    blockcache and the data blocks are kept in the bucketcache.</description>
+  </property>
+  <property>
+    <name>hbase.bucketcache.size</name>
+    <value></value>
+    <description>A float that EITHER represents a percentage of total heap memory
+    size to give to the cache (if &lt; 1.0) OR, it is the total capacity in
+    megabytes of BucketCache. Default: 0.0</description>
+  </property>
+  <property>
+    <name>hbase.bucketcache.sizes</name>
+    <value></value>
+    <description>A comma-separated list of sizes for buckets for the bucketcache.
+    Can be multiple sizes. List block sizes in order from smallest to largest.
+    The sizes you use will depend on your data access patterns.
+    Must be a multiple of 1024 else you will run into
+    'java.io.IOException: Invalid HFile block magic' when you go to read from cache.
+    If you specify no values here, then you pick up the default bucketsizes set
+    in code (See BucketAllocator#DEFAULT_BUCKET_SIZES). 
+  </description>
+  </property>
+  <property>
       <name>hfile.format.version</name>
       <value>3</value>
       <description>The HFile format version to use for new files.
@@ -808,7 +842,7 @@ possible configurations would overwhelm and obscure the important.
       <name>hbase.rs.cacheblocksonwrite</name>
       <value>false</value>
       <description>Whether an HFile block should be added to the block cache when the
-          block is finished.</description>
+        block is finished.</description>
   </property>
   <property>
     <name>hbase.rpc.timeout</name>