HBASE-23330: Fix delegation token fetch with MasterRegistry

Signed-off-by: Andrew Purtell <apurtell@apache.org>

hbase-client/src/main/java/org/apache/hadoop/hbase/client/Connection.java

@@ -166,6 +166,11 @@ public interface Connection extends Abortable, Closeable {
    */
   Admin getAdmin() throws IOException;
 
+  /**
+   * @return the cluster ID unique to this HBase cluster.
+   */
+  String getClusterId() throws IOException;
+
   @Override
   public void close() throws IOException;
 

hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionAdapter.java

@@ -501,4 +501,9 @@ abstract class ConnectionAdapter implements ClusterConnection {
   public RpcControllerFactory getRpcControllerFactory() {
     return wrappedConnection.getRpcControllerFactory();
   }
+
+  @Override
+  public String getClusterId() throws IOException {
+    return wrappedConnection.getClusterId();
+  }
 }

hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java

@@ -824,6 +824,11 @@ class ConnectionManager {
       return new HBaseAdmin(this);
     }
 
+    @Override
+    public String getClusterId() throws IOException {
+      return registry.getClusterId();
+    }
+
     @Override
     public MetricsConnection getConnectionMetrics() {
       return this.metrics;

hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java

@@ -305,7 +305,7 @@ public class TokenUtil {
   public static void addTokenForJob(final Connection conn, final JobConf job, User user)
       throws IOException, InterruptedException {
 
-    Token<AuthenticationTokenIdentifier> token = getAuthToken(conn.getConfiguration(), user);
+    Token<AuthenticationTokenIdentifier> token = getAuthToken(conn, user);
     if (token == null) {
       token = obtainToken(conn, user);
     }
@@ -324,7 +324,7 @@ public class TokenUtil {
    */
   public static void addTokenForJob(final Connection conn, User user, Job job)
       throws IOException, InterruptedException {
-    Token<AuthenticationTokenIdentifier> token = getAuthToken(conn.getConfiguration(), user);
+    Token<AuthenticationTokenIdentifier> token = getAuthToken(conn, user);
     if (token == null) {
       token = obtainToken(conn, user);
     }
@@ -343,7 +343,7 @@ public class TokenUtil {
    */
   public static boolean addTokenIfMissing(Connection conn, User user)
       throws IOException, InterruptedException {
-    Token<AuthenticationTokenIdentifier> token = getAuthToken(conn.getConfiguration(), user);
+    Token<AuthenticationTokenIdentifier> token = getAuthToken(conn, user);
     if (token == null) {
       token = obtainToken(conn, user);
       user.getUGI().addToken(token.getService(), token);
@@ -356,19 +356,9 @@ public class TokenUtil {
    * Get the authentication token of the user for the cluster specified in the configuration
    * @return null if the user does not have the token, otherwise the auth token for the cluster.
    */
-  private static Token<AuthenticationTokenIdentifier> getAuthToken(Configuration conf, User user)
+  private static Token<AuthenticationTokenIdentifier> getAuthToken(Connection conn, User user)
-      throws IOException, InterruptedException {
+      throws IOException {
-    ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "TokenUtil-getAuthToken", null);
+    String clusterId = conn.getClusterId();
-    try {
+    return new AuthenticationTokenSelector().selectToken(new Text(clusterId), user.getTokens());
-      String clusterId = ZKClusterId.readClusterIdZNode(zkw);
-      if (clusterId == null) {
-        throw new IOException("Failed to get cluster ID");
-      }
-      return new AuthenticationTokenSelector().selectToken(new Text(clusterId), user.getTokens());
-    } catch (KeeperException e) {
-      throw new IOException(e);
-    } finally {
-      zkw.close();
-    }
   }
 }

hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMasterAddressRefresher.java

@@ -81,6 +81,11 @@ public class TestMasterAddressRefresher {
       return null;
     }
 
+    @Override
+    public String getClusterId() throws IOException {
+      return null;
+    }
+
     @Override
     public void close() throws IOException {