From 1bbc7fd8f4865caf33b2e3c1fad27153b94b3d63 Mon Sep 17 00:00:00 2001
From: xicm <xicm000@gmail.com>
Date: Mon, 19 Sep 2022 14:46:46 +0800
Subject: [PATCH 1/2] [HUDI-3983] ClassNotFoundException when using
 hudi-spark-bundle to write table with hbase index

---
 hudi-common/src/main/resources/hbase-site.xml | 17 ++++++++++-------
 packaging/hudi-spark-bundle/pom.xml           |  3 +++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/hudi-common/src/main/resources/hbase-site.xml b/hudi-common/src/main/resources/hbase-site.xml
index 3722cae18ee5b..4e19083fbc70a 100644
--- a/hudi-common/src/main/resources/hbase-site.xml
+++ b/hudi-common/src/main/resources/hbase-site.xml
@@ -1699,13 +1699,16 @@ possible configurations would overwhelm and obscure the important.
       Implementation of the status publication with a multicast message.
     </description>
   </property>
-  <property>
-    <name>hbase.status.listener.class</name>
-    <value>org.apache.hadoop.hbase.client.ClusterStatusListener$MulticastListener</value>
-    <description>
-      Implementation of the status listener with a multicast message.
-    </description>
-  </property>
+
+  <!-- Hbase related classes used in hudi bundle packages are in shaded pattern,
+  this config can cause ClassNotFoundException -->
+  <!--<property>-->
+  <!--  <name>hbase.status.listener.class</name>-->
+  <!--  <value>org.apache.hadoop.hbase.client.ClusterStatusListener$MulticastListener</value>-->
+  <!--  <description>-->
+  <!--    Implementation of the status listener with a multicast message.-->
+  <!--  </description>-->
+  <!--</property>-->
   <property>
     <name>hbase.status.multicast.address.ip</name>
     <value>226.1.1.3</value>
diff --git a/packaging/hudi-spark-bundle/pom.xml b/packaging/hudi-spark-bundle/pom.xml
index 4d474ae67edc3..13cbb813d4711 100644
--- a/packaging/hudi-spark-bundle/pom.xml
+++ b/packaging/hudi-spark-bundle/pom.xml
@@ -300,6 +300,9 @@
                     <exclude>META-INF/services/javax.*</exclude>
                     <exclude>**/*.proto</exclude>
                     <exclude>hbase-webapps/**</exclude>
+                    <!-- hbase-default.xml comes from hbase-common, hbase related classes used in hudi are in shaded
+                    pattern, the default classes in hbase-default.xml can cause ClassNotFoundException. -->
+                    <exclude>hbase-default.xml</exclude>
                   </excludes>
                 </filter>
               </filters>

From 65ea0481e84d1fa8a80c3c8fb3f3083652158fd6 Mon Sep 17 00:00:00 2001
From: xicm <xicm000@gmail.com>
Date: Wed, 21 Sep 2022 09:56:59 +0800
Subject: [PATCH 2/2] remove commented conf

---
 hudi-common/src/main/resources/hbase-site.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/hudi-common/src/main/resources/hbase-site.xml b/hudi-common/src/main/resources/hbase-site.xml
index 4e19083fbc70a..67853ae3ec982 100644
--- a/hudi-common/src/main/resources/hbase-site.xml
+++ b/hudi-common/src/main/resources/hbase-site.xml
@@ -1699,16 +1699,6 @@ possible configurations would overwhelm and obscure the important.
       Implementation of the status publication with a multicast message.
     </description>
   </property>
-
-  <!-- Hbase related classes used in hudi bundle packages are in shaded pattern,
-  this config can cause ClassNotFoundException -->
-  <!--<property>-->
-  <!--  <name>hbase.status.listener.class</name>-->
-  <!--  <value>org.apache.hadoop.hbase.client.ClusterStatusListener$MulticastListener</value>-->
-  <!--  <description>-->
-  <!--    Implementation of the status listener with a multicast message.-->
-  <!--  </description>-->
-  <!--</property>-->
   <property>
     <name>hbase.status.multicast.address.ip</name>
     <value>226.1.1.3</value>