From de0579e6f6cc98267dac149b7068c07113673097 Mon Sep 17 00:00:00 2001
From: Biju Nair <gs.biju@gmail.com>
Date: Wed, 27 Jan 2016 11:46:36 -0500
Subject: [PATCH] [hbase098] Changes to use single HBase connection across all
the threads
---
.../java/com/yahoo/ycsb/db/HBaseClient.java | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/hbase098/src/main/java/com/yahoo/ycsb/db/HBaseClient.java b/hbase098/src/main/java/com/yahoo/ycsb/db/HBaseClient.java
index b0dc20c1..9b097b37 100644
--- a/hbase098/src/main/java/com/yahoo/ycsb/db/HBaseClient.java
+++ b/hbase098/src/main/java/com/yahoo/ycsb/db/HBaseClient.java
@@ -50,6 +50,7 @@ import java.util.Properties;
import java.util.Random;
import java.util.Set;
import java.util.Vector;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* HBase client for YCSB framework
@@ -59,11 +60,12 @@ public class HBaseClient extends com.yahoo.ycsb.DB
// BFC: Change to fix broken build (with HBase 0.20.6)
//private static final Configuration config = HBaseConfiguration.create();
private static final Configuration config = HBaseConfiguration.create(); //new HBaseConfiguration();
+ private static final AtomicInteger THREAD_COUNT = new AtomicInteger(0);
public boolean _debug=false;
public String _table="";
- public HConnection _hConn=null;
+ private static HConnection _hConn=null;
public HTableInterface _hTable=null;
public String _columnFamily="";
public byte _columnFamilyBytes[];
@@ -112,7 +114,12 @@ public class HBaseClient extends com.yahoo.ycsb.DB
}
}
try {
- _hConn = HConnectionManager.createConnection(config);
+ THREAD_COUNT.getAndIncrement();
+ synchronized(THREAD_COUNT) {
+ if (_hConn == null){
+ _hConn = HConnectionManager.createConnection(config);
+ }
+ }
} catch (IOException e) {
System.err.println("Connection to HBase was not successful");
throw new DBException(e);
@@ -154,8 +161,11 @@ public class HBaseClient extends com.yahoo.ycsb.DB
if (_hTable != null) {
_hTable.flushCommits();
}
- if (_hConn != null) {
- _hConn.close();
+ synchronized(THREAD_COUNT) {
+ int threadCount = THREAD_COUNT.decrementAndGet();
+ if (threadCount <= 0 && _hConn != null) {
+ _hConn.close();
+ }
}
long en=System.nanoTime();
_measurements.measure("UPDATE", (int)((en-st)/1000));
--
GitLab