Merge pull request brianfrankcooper#274 from takebayashi/hbase-writeb…

…uffersize [hbase] Make write buffer size of HBase client configurable
jaricftw · Jun 3, 2015 · c5fc808 · c5fc808
2 parents 7d53bb0 + f070afa
commit c5fc808
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/hbase/src/main/java/com/yahoo/ycsb/db/HBaseClient.java b/hbase/src/main/java/com/yahoo/ycsb/db/HBaseClient.java
@@ -61,6 +61,7 @@ public class HBaseClient extends com.yahoo.ycsb.DB
     public String _columnFamily="";
     public byte _columnFamilyBytes[];
     public boolean _clientSideBuffering = false;
+    public long _writeBufferSize = 1024 * 1024 * 12;
 
     public static final int Ok=0;
     public static final int ServerError=-1;
@@ -85,6 +86,10 @@ public void init() throws DBException
         {
             _clientSideBuffering = Boolean.parseBoolean(getProperties().getProperty("clientbuffering"));
         }
+        if (getProperties().containsKey("writebuffersize"))
+        {
+            _writeBufferSize = Long.parseLong(getProperties().getProperty("writebuffersize"));
+        }
 
         _columnFamily = getProperties().getProperty("columnfamily");
         if (_columnFamily == null)
@@ -123,7 +128,7 @@ public void getHTable(String table) throws IOException
             _hTable = new HTable(config, table);
             //2 suggestions from http://ryantwopointoh.blogspot.com/2009/01/performance-of-hbase-importing.html
             _hTable.setAutoFlush(!_clientSideBuffering, true);
-            _hTable.setWriteBufferSize(1024*1024*12);
+            _hTable.setWriteBufferSize(_writeBufferSize);
             //return hTable;
         }
 

diff --git a/hbase/src/main/java/com/yahoo/ycsb/db/HBaseClient10.java b/hbase/src/main/java/com/yahoo/ycsb/db/HBaseClient10.java
@@ -89,6 +89,7 @@ public class HBaseClient10 extends com.yahoo.ycsb.DB
      * insert/update/delete latencies, client side buffering should be disabled.
      */
     public boolean _clientSideBuffering = false;
+    public long _writeBufferSize = 1024 * 1024 * 12;
 
     public static final int Ok=0;
     public static final int ServerError=-1;
@@ -105,6 +106,9 @@ public void init() throws DBException
         if ("true".equals(getProperties().getProperty("clientbuffering", "false"))) {
             this._clientSideBuffering = true;
         }
+        if (getProperties().containsKey("writebuffersize")) {
+            _writeBufferSize = Long.parseLong(getProperties().getProperty("writebuffersize"));
+        }
 
         if (getProperties().getProperty("durability") != null) {
             this._durability = Durability.valueOf(getProperties().getProperty("durability"));
@@ -166,7 +170,7 @@ public void getHTable(String table) throws IOException
         //suggestions from http://ryantwopointoh.blogspot.com/2009/01/performance-of-hbase-importing.html
         if (_clientSideBuffering) {
             final BufferedMutatorParams p = new BufferedMutatorParams(tableName);
-            p.writeBufferSize(1024*1024*12);
+            p.writeBufferSize(_writeBufferSize);
             this._bufferedMutator = this._connection.getBufferedMutator(p);
         }
     }