You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ga...@apache.org on 2013/02/06 22:23:51 UTC
svn commit: r1443221 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Author: garyh
Date: Wed Feb 6 21:23:50 2013
New Revision: 1443221
URL: http://svn.apache.org/viewvc?rev=1443221&view=rev
Log:
HBASE-7772 Cluster ID is not initialized correctly in RPC client
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1443221&r1=1443220&r2=1443221&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Wed Feb 6 21:23:50 2013
@@ -584,9 +584,6 @@ public class HConnectionManager {
throws ZooKeeperConnectionException {
this.conf = conf;
this.managed = managed;
- // ProtobufRpcClientEngine is the main RpcClientEngine implementation,
- // but we maintain access through an interface to allow overriding for tests
- this.rpcEngine = new ProtobufRpcClientEngine(conf);
String adminClassName = conf.get(REGION_PROTOCOL_CLASS,
DEFAULT_ADMIN_PROTOCOL_CLASS);
this.closed = false;
@@ -621,6 +618,10 @@ public class HConnectionManager {
HConstants.DEFAULT_HBASE_CLIENT_PREFETCH_LIMIT);
retrieveClusterId();
+ // ProtobufRpcClientEngine is the main RpcClientEngine implementation,
+ // but we maintain access through an interface to allow overriding for tests
+ // RPC engine setup must follow obtaining the cluster ID for token authentication to work
+ this.rpcEngine = new ProtobufRpcClientEngine(this.conf);
}
/**