From c13e313fc0c19a923b78a203c147f7a4c4109cf5 Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Wed, 28 Feb 2024 16:56:36 +0100 Subject: [PATCH] HBASE-28342 changes to DecommissionedHostRejectedException interface (addendum) --- .../DecommissionedHostRejectedException.java | 4 ++-- .../org/apache/hadoop/hbase/master/ServerManager.java | 1 + .../apache/hadoop/hbase/regionserver/HRegionServer.java | 2 +- .../hbase/regionserver/TestRegionServerReportForDuty.java | 8 ++++---- 4 files changed, 8 insertions(+), 7 deletions(-) rename hbase-server/src/main/java/org/apache/hadoop/hbase/{master => ipc}/DecommissionedHostRejectedException.java (94%) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/DecommissionedHostRejectedException.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/DecommissionedHostRejectedException.java similarity index 94% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/master/DecommissionedHostRejectedException.java rename to hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/DecommissionedHostRejectedException.java index 3d28b1e75be8..f96e2f2afde0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/DecommissionedHostRejectedException.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/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 index a2ed4da53e39..3217b6dfcc92 100644 --- 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 @@ -53,6 +53,7 @@ import org.apache.hadoop.hbase.client.AsyncRegionServerAdmin; 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.RemoteWithExtrasException; import org.apache.hadoop.hbase.master.assignment.RegionStates; import org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure; 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 index c71859ee6c1e..88863c06e4bd 100644 --- 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 @@ -115,12 +115,12 @@ import org.apache.hadoop.hbase.io.hfile.bucket.BucketCache; 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.RpcClient; import org.apache.hadoop.hbase.ipc.RpcServer; 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.mob.MobFileCache; import org.apache.hadoop.hbase.mob.RSMobFileCleanerChore; import org.apache.hadoop.hbase.monitoring.TaskMonitor; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java index b408229f59fa..ff8bdab5848a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java +++ b/hbase-server/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.ServerName; import org.apache.hadoop.hbase.SingleProcessHBaseCluster.MiniHBaseClusterRegionServer; +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.ServerManager; import org.apache.hadoop.hbase.testclassification.LargeTests; @@ -293,9 +293,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()),