[hbase] branch branch-2.1 updated: HBASE-21639 maxHeapUsage value not read properly from config during EntryBuffers initialization

[stack]

This is an automated email from the ASF dual-hosted git repository.

stack pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new 12dfc8b  HBASE-21639 maxHeapUsage value not read properly from config 
during EntryBuffers initialization
12dfc8b is described below

commit 12dfc8bafd9054969deb0d6261380287d5977143
Author: Pankaj <pankaj...@huawei.com>
AuthorDate: Sat Dec 29 00:54:48 2018 +0530

    HBASE-21639 maxHeapUsage value not read properly from config during 
EntryBuffers initialization
---
 .../replication/regionserver/RegionReplicaReplicationEndpoint.java     | 3 +--
 .../src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RegionReplicaReplicationEndpoint.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RegionReplicaReplicationEndpoint.java
index cb755fe..e0e58c3 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RegionReplicaReplicationEndpoint.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RegionReplicaReplicationEndpoint.java
@@ -131,8 +131,7 @@ public class RegionReplicaReplicationEndpoint extends 
HBaseReplicationEndpoint {
       "hbase.region.replica.replication.writer.threads", 3);
     controller = new PipelineController();
     entryBuffers = new EntryBuffers(controller,
-      this.conf.getInt("hbase.region.replica.replication.buffersize",
-          128*1024*1024));
+        this.conf.getLong("hbase.region.replica.replication.buffersize", 128 * 
1024 * 1024));
 
     // use the regular RPC timeout for replica replication RPC's
     this.operationTimeout = 
conf.getInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT,
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
index 4a18ce5..638c574 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
@@ -166,7 +166,7 @@ public class WALSplitter {
     this.splitWriterCreationBounded = 
conf.getBoolean(SPLIT_WRITER_CREATION_BOUNDED, false);
 
     entryBuffers = new EntryBuffers(controller,
-        this.conf.getInt("hbase.regionserver.hlog.splitlog.buffersize", 128 * 
1024 * 1024),
+        this.conf.getLong("hbase.regionserver.hlog.splitlog.buffersize", 128 * 
1024 * 1024),
         splitWriterCreationBounded);
 
     int numWriterThreads = 
this.conf.getInt("hbase.regionserver.hlog.splitlog.writer.threads", 3);