You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2018/09/07 22:15:38 UTC
hbase git commit: HBASE-21166 Creating a CoprocessorHConnection
re-retrieves the cluster id from ZK.
Repository: hbase
Updated Branches:
refs/heads/branch-1 e03e4c9f5 -> d236a5fab
HBASE-21166 Creating a CoprocessorHConnection re-retrieves the cluster id from ZK.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d236a5fa
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d236a5fa
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d236a5fa
Branch: refs/heads/branch-1
Commit: d236a5fab8794c9d9e78012a314aae3b4853f6f9
Parents: e03e4c9
Author: Lars Hofhansl <la...@apache.org>
Authored: Fri Sep 7 15:16:54 2018 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Fri Sep 7 15:16:54 2018 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/client/ConnectionManager.java | 14 ++++++++++----
.../hadoop/hbase/client/CoprocessorHConnection.java | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d236a5fa/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
index 993f4d1..7cf09c2 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
@@ -638,9 +638,14 @@ class ConnectionManager {
private final ReentrantLock userRegionLock = new ReentrantLock();
- HConnectionImplementation(Configuration conf, boolean managed) throws IOException {
- this(conf, managed, null, null);
- }
+ HConnectionImplementation(Configuration conf, boolean managed) throws IOException {
+ this(conf, managed, null, null);
+ }
+
+ HConnectionImplementation(Configuration conf, boolean managed, ExecutorService pool, User user)
+ throws IOException {
+ this(conf, managed, pool, user, null);
+ }
/**
* constructor
@@ -654,7 +659,8 @@ class ConnectionManager {
* users of an HConnectionImplementation instance.
*/
HConnectionImplementation(Configuration conf, boolean managed,
- ExecutorService pool, User user) throws IOException {
+ ExecutorService pool, User user, String clusterId) throws IOException {
+ this.clusterId = clusterId;
this.conf = conf;
this.user = user;
this.batchPool = pool;
http://git-wip-us.apache.org/repos/asf/hbase/blob/d236a5fa/hbase-server/src/main/java/org/apache/hadoop/hbase/client/CoprocessorHConnection.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/CoprocessorHConnection.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/CoprocessorHConnection.java
index 1db90fb..5b2692b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/CoprocessorHConnection.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/CoprocessorHConnection.java
@@ -96,7 +96,7 @@ public class CoprocessorHConnection extends HConnectionImplementation {
* @throws IOException if we cannot create the connection
*/
public CoprocessorHConnection(Configuration conf, HRegionServer server) throws IOException {
- super(conf, false, null, UserProvider.instantiate(conf).getCurrent());
+ super(conf, false, null, UserProvider.instantiate(conf).getCurrent(), server.getClusterId());
this.server = server;
this.serverName = server.getServerName();
}