From beed49119d3a67ee91c666d6917b6ebd87271a5c Mon Sep 17 00:00:00 2001
From: Rushabh Shah <shahrs87@apache.org>
Date: Mon, 3 Jul 2023 12:19:57 -0700
Subject: [PATCH 1/2] HBASE-27957 HConnection (and ZookeeprWatcher threads)
 leak in case of AUTH_FAILED exception.

---
 .../apache/hadoop/hbase/client/ConnectionImplementation.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
index bcb295a2628b..7771233484c7 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
@@ -673,14 +673,14 @@ public String toString() {
 
   protected String clusterId = null;
 
-  protected void retrieveClusterId() {
+  protected void retrieveClusterId() throws IOException {
     if (clusterId != null) {
       return;
     }
     try {
       this.clusterId = this.registry.getClusterId().get();
     } catch (InterruptedException | ExecutionException e) {
-      LOG.warn("Retrieve cluster id failed", e);
+      throw new IOException("Retrieve cluster id failed", e);
     }
     if (clusterId == null) {
       clusterId = HConstants.CLUSTER_ID_DEFAULT;

From 383c362f1989d2b653e2004aa0e9bc6ef00c82e9 Mon Sep 17 00:00:00 2001
From: Rushabh Shah <shahrs87@apache.org>
Date: Mon, 3 Jul 2023 14:14:29 -0700
Subject: [PATCH 2/2] Trigger tests in hbase-server

---
 hbase-server/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 7a18fdcfd069..5b1dcd0783a3 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -20,6 +20,7 @@
  */
 -->
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.hbase</groupId>
     <artifactId>hbase-build-configuration</artifactId>