You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2015/09/10 18:18:32 UTC
hbase git commit: HBASE-14361 Investigate unused connection objects
Repository: hbase
Updated Branches:
refs/heads/master 21dfb61bb -> eb8a8c4fd
HBASE-14361 Investigate unused connection objects
Signed-off-by: stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/eb8a8c4f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/eb8a8c4f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/eb8a8c4f
Branch: refs/heads/master
Commit: eb8a8c4fd9f431e86008f374f7f40f9a70c1657d
Parents: 21dfb61
Author: chenheng <ch...@fenbi.com>
Authored: Wed Sep 9 15:40:22 2015 +0800
Committer: stack <st...@apache.org>
Committed: Thu Sep 10 09:18:23 2015 -0700
----------------------------------------------------------------------
.../hbase/replication/regionserver/ReplicationSink.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/eb8a8c4f/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java
index fc7aa8e..ab07f51 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java
@@ -72,7 +72,7 @@ public class ReplicationSink {
private static final Log LOG = LogFactory.getLog(ReplicationSink.class);
private final Configuration conf;
- private final Connection sharedHtableCon;
+ private Connection sharedHtableCon;
private final MetricsSink metrics;
private final AtomicLong totalReplicatedEdits = new AtomicLong();
@@ -88,7 +88,6 @@ public class ReplicationSink {
this.conf = HBaseConfiguration.create(conf);
decorateConf();
this.metrics = new MetricsSink();
- this.sharedHtableCon = ConnectionFactory.createConnection(this.conf);
}
/**
@@ -213,7 +212,9 @@ public class ReplicationSink {
*/
public void stopReplicationSinkServices() {
try {
- this.sharedHtableCon.close();
+ if (this.sharedHtableCon != null) {
+ this.sharedHtableCon.close();
+ }
} catch (IOException e) {
LOG.warn("IOException while closing the connection", e); // ignoring as we are closing.
}
@@ -232,6 +233,9 @@ public class ReplicationSink {
}
Table table = null;
try {
+ if (this.sharedHtableCon == null) {
+ this.sharedHtableCon = ConnectionFactory.createConnection(this.conf);
+ }
table = this.sharedHtableCon.getTable(tableName);
for (List<Row> rows : allRows) {
table.batch(rows, null);