You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ec...@apache.org on 2015/12/10 00:39:22 UTC
hbase git commit: HBASE-14942 Allow turning off BoundedByteBufferPool
Repository: hbase
Updated Branches:
refs/heads/branch-1.2 f4fec4cd1 -> 35cfcab68
HBASE-14942 Allow turning off BoundedByteBufferPool
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/35cfcab6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/35cfcab6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/35cfcab6
Branch: refs/heads/branch-1.2
Commit: 35cfcab6819053c7c3910524c21b24e6b51aeff0
Parents: f4fec4c
Author: Elliott Clark <ec...@apache.org>
Authored: Mon Dec 7 11:01:51 2015 -0800
Committer: Elliott Clark <ec...@apache.org>
Committed: Wed Dec 9 15:33:25 2015 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/ipc/RpcServer.java | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/35cfcab6/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
index b805ad7..cd38bd7 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
@@ -1988,13 +1988,19 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver {
final InetSocketAddress bindAddress, Configuration conf,
RpcScheduler scheduler)
throws IOException {
- this.reservoir = new BoundedByteBufferPool(
- conf.getInt("hbase.ipc.server.reservoir.max.buffer.size", 1024 * 1024),
- conf.getInt("hbase.ipc.server.reservoir.initial.buffer.size", 16 * 1024),
- // Make the max twice the number of handlers to be safe.
- conf.getInt("hbase.ipc.server.reservoir.initial.max",
- conf.getInt(HConstants.REGION_SERVER_HANDLER_COUNT,
- HConstants.DEFAULT_REGION_SERVER_HANDLER_COUNT) * 2));
+
+ if (conf.getBoolean("hbase.ipc.server.reservoir.enabled", true)) {
+ this.reservoir = new BoundedByteBufferPool(
+ conf.getInt("hbase.ipc.server.reservoir.max.buffer.size", 1024 * 1024),
+ conf.getInt("hbase.ipc.server.reservoir.initial.buffer.size", 16 * 1024),
+ // Make the max twice the number of handlers to be safe.
+ conf.getInt("hbase.ipc.server.reservoir.initial.max",
+ conf.getInt(HConstants.REGION_SERVER_HANDLER_COUNT,
+ HConstants.DEFAULT_REGION_SERVER_HANDLER_COUNT) * 2));
+ } else {
+ reservoir = null;
+ }
+
this.server = server;
this.services = services;
this.bindAddress = bindAddress;