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;
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>