From 1392824a85bcc51843b00c631d5cb0330590a22c Mon Sep 17 00:00:00 2001 From: Gary Helmling Date: Wed, 6 Feb 2013 21:23:50 +0000 Subject: [PATCH] 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 --- .../org/apache/hadoop/hbase/client/HConnectionManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java index 2a1297a5ce8..543649004a3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java @@ -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); } /**