lee/heritrix3
1
0
Fork 0
mirror of https://github.com/internetarchive/heritrix3.git synced 2026-09-23 06:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #224 from nlevitt/hbase-refactor

Browse Source 
un-threadlocal the HConnection
This commit is contained in:
Barbara Miller
2018-12-18 12:20:17 -08:00
committed by GitHub
parent 3ca01ec3a9 d7d320d372
commit 1a5340daee
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/src/main/java/org/archive/modules/recrawl/hbase/HBaseTable.java
+9 -8
View File
@@ -42,7 +42,7 @@ public class HBaseTable extends HBaseTableBean {
Logger.getLogger(HBaseTable.class.getName());
protected boolean create = false;
protected ThreadLocal<HConnection> hconn = new ThreadLocal<HConnection>();
protected HConnection hconn = null;
protected ThreadLocal<HTableInterface> htable = new ThreadLocal<HTableInterface>();
public boolean getCreate() {
@@ -56,11 +56,11 @@ public class HBaseTable extends HBaseTableBean {
public HBaseTable() {
}
protected HConnection hconnection() throws IOException {
if (hconn.get() == null) {
hconn.set(HConnectionManager.createConnection(hbase.configuration()));
protected synchronized HConnection hconnection() throws IOException {
if (hconn == null) {
hconn = HConnectionManager.createConnection(hbase.configuration());
}
return hconn.get();
return hconn;
}
protected HTableInterface htable() throws IOException {
@@ -138,13 +138,14 @@ public class HBaseTable extends HBaseTableBean {
htable.remove();
}
if (hconn.get() != null) {
if (hconn != null) {
try {
hconn.get().close();
hconn.close();
} catch (IOException e) {
logger.log(Level.WARNING, "hconn.close() threw " + e, e);
}
hconn.remove();
// HConnectionManager.deleteStaleConnection(hconn);
hconn = null;
}
hbase.reset();