HBASE-7772 Cluster ID is not initialized correctly in RPC client

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1443221 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Helmling 2013-02-06 21:23:50 +00:00
parent 95bd04444b
commit 1392824a85
1 changed files with 4 additions and 3 deletions

View File

@ -584,9 +584,6 @@ public class HConnectionManager {
throws ZooKeeperConnectionException { throws ZooKeeperConnectionException {
this.conf = conf; this.conf = conf;
this.managed = managed; 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, String adminClassName = conf.get(REGION_PROTOCOL_CLASS,
DEFAULT_ADMIN_PROTOCOL_CLASS); DEFAULT_ADMIN_PROTOCOL_CLASS);
this.closed = false; this.closed = false;
@ -621,6 +618,10 @@ public class HConnectionManager {
HConstants.DEFAULT_HBASE_CLIENT_PREFETCH_LIMIT); HConstants.DEFAULT_HBASE_CLIENT_PREFETCH_LIMIT);
retrieveClusterId(); 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);
} }
/** /**