HubSpot Backport: HBASE-28342 changes to DecommissionedHostRejectedEx…

…ception interface (addendum) (apache#5717) Signed-off-by: Nihal Jain <[email protected]>
HubSpot · Mar 1, 2024 · 9fde669 · 9fde669
1 parent 073471b
commit 9fde669
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.../DecommissionedHostRejectedException.java → .../DecommissionedHostRejectedException.java b/.../DecommissionedHostRejectedException.java → .../DecommissionedHostRejectedException.java
@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase.master;
+package org.apache.hadoop.hbase.ipc;
 
 import org.apache.hadoop.hbase.HBaseIOException;
 import org.apache.yetus.audience.InterfaceAudience;
 
-@InterfaceAudience.Private
+@InterfaceAudience.Public
 public class DecommissionedHostRejectedException extends HBaseIOException {
   public DecommissionedHostRejectedException(String message) {
     super(message);

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
@@ -46,6 +46,7 @@
 import org.apache.hadoop.hbase.client.ClusterConnection;
 import org.apache.hadoop.hbase.client.RegionInfo;
 import org.apache.hadoop.hbase.conf.ConfigurationObserver;
+import org.apache.hadoop.hbase.ipc.DecommissionedHostRejectedException;
 import org.apache.hadoop.hbase.ipc.HBaseRpcController;
 import org.apache.hadoop.hbase.ipc.RemoteWithExtrasException;
 import org.apache.hadoop.hbase.ipc.RpcControllerFactory;

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -118,6 +118,7 @@
 import org.apache.hadoop.hbase.io.hfile.HFile;
 import org.apache.hadoop.hbase.io.util.MemorySizeUtil;
 import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils;
+import org.apache.hadoop.hbase.ipc.DecommissionedHostRejectedException;
 import org.apache.hadoop.hbase.ipc.NettyRpcClientConfigHelper;
 import org.apache.hadoop.hbase.ipc.RpcClient;
 import org.apache.hadoop.hbase.ipc.RpcClientFactory;
@@ -127,7 +128,6 @@
 import org.apache.hadoop.hbase.ipc.ServerNotRunningYetException;
 import org.apache.hadoop.hbase.ipc.ServerRpcController;
 import org.apache.hadoop.hbase.log.HBaseMarkers;
-import org.apache.hadoop.hbase.master.DecommissionedHostRejectedException;
 import org.apache.hadoop.hbase.master.HMaster;
 import org.apache.hadoop.hbase.master.LoadBalancer;
 import org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer;

diff --git a/...ver/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java b/...ver/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
@@ -38,8 +38,8 @@
 import org.apache.hadoop.hbase.MatcherPredicate;
 import org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer;
 import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.ipc.DecommissionedHostRejectedException;
 import org.apache.hadoop.hbase.ipc.ServerNotRunningYetException;
-import org.apache.hadoop.hbase.master.DecommissionedHostRejectedException;
 import org.apache.hadoop.hbase.master.HMaster;
 import org.apache.hadoop.hbase.master.LoadBalancer;
 import org.apache.hadoop.hbase.master.ServerManager;
@@ -305,9 +305,9 @@ public void testReportForDutyGetsRejectedByMasterWhenConfiguredToRejectDecommiss
 
     /**
      * Assert that the following log message occurred (one line):
-     * "org.apache.hadoop.hbase.master.DecommissionedHostRejectedException:
-     * org.apache.hadoop.hbase.master.DecommissionedHostRejectedException: Host localhost exists in
-     * the list of decommissioned servers and Master is configured to reject decommissioned hosts"
+     * "org.apache.hadoop.hbase.ipc.DecommissionedHostRejectedException:
+     * org.apache.hadoop.hbase.ipc.DecommissionedHostRejectedException: Host localhost exists in the
+     * list of decommissioned servers and Master is configured to reject decommissioned hosts"
      */
     assertThat(Arrays.asList(capturer.getOutput().split("\n")),
       hasItem(allOf(containsString(DecommissionedHostRejectedException.class.getSimpleName()),