HBASE-30069:Instead of generic DoNotRetryIOException send specific Exception (#8059)

Author: sharmaar12

hbase-client/src/main/java/org/apache/hadoop/hbase/WriteAttemptedOnReadOnlyClusterException.java

@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase;
+
+import org.apache.yetus.audience.InterfaceAudience;
+
+/**
+ * Thrown when a write is attempted on a read-only HBase cluster.
+ */
+@InterfaceAudience.Public
+public class WriteAttemptedOnReadOnlyClusterException extends DoNotRetryIOException {
+
+  private static final long serialVersionUID = 1L;
+
+  public WriteAttemptedOnReadOnlyClusterException() {
+    super();
+  }
+
+  /**
+   * @param message the message for this exception
+   */
+  public WriteAttemptedOnReadOnlyClusterException(String message) {
+    super(message);
+  }
+
+  /**
+   * @param message   the message for this exception
+   * @param throwable the {@link Throwable} to use for this exception
+   */
+  public WriteAttemptedOnReadOnlyClusterException(String message, Throwable throwable) {
+    super(message, throwable);
+  }
+
+  /**
+   * @param throwable the {@link Throwable} to use for this exception
+   */
+  public WriteAttemptedOnReadOnlyClusterException(Throwable throwable) {
+    super(throwable);
+  }
+}

hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AbstractReadOnlyController.java

@@ -26,10 +26,10 @@
 import org.apache.hadoop.hbase.ActiveClusterSuffix;
 import org.apache.hadoop.hbase.Coprocessor;
 import org.apache.hadoop.hbase.CoprocessorEnvironment;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HBaseInterfaceAudience;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.WriteAttemptedOnReadOnlyClusterException;
 import org.apache.hadoop.hbase.coprocessor.ObserverContext;
 import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
@@ -56,8 +56,8 @@ public static boolean isWritableInReadOnlyMode(final TableName tableName) {
     return writableTables.contains(tableName);
   }
 
-  protected void internalReadOnlyGuard() throws DoNotRetryIOException {
-    throw new DoNotRetryIOException("Operation not allowed in Read-Only Mode");
+  protected void internalReadOnlyGuard() throws WriteAttemptedOnReadOnlyClusterException {
+    throw new WriteAttemptedOnReadOnlyClusterException("Operation not allowed in Read-Only Mode");
   }
 
   @Override

hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestReadOnlyControllerBulkLoadObserver.java

@@ -17,11 +17,11 @@
  */
 package org.apache.hadoop.hbase.security.access;
 
+import static org.junit.Assert.assertThrows;
 import static org.mockito.Mockito.mock;
 
-import java.io.IOException;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.WriteAttemptedOnReadOnlyClusterException;
 import org.apache.hadoop.hbase.coprocessor.ObserverContext;
 import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
 import org.apache.hadoop.hbase.testclassification.SecurityTests;
@@ -58,13 +58,17 @@ public void tearDown() throws Exception {
 
   }
 
-  @Test(expected = DoNotRetryIOException.class)
-  public void testPrePrepareBulkLoadReadOnlyException() throws IOException {
-    bulkLoadReadOnlyController.prePrepareBulkLoad(ctx);
+  @Test
+  public void testPrePrepareBulkLoadReadOnlyException() {
+    assertThrows(WriteAttemptedOnReadOnlyClusterException.class, () -> {
+      bulkLoadReadOnlyController.prePrepareBulkLoad(ctx);
+    });
   }
 
-  @Test(expected = DoNotRetryIOException.class)
-  public void testPreCleanupBulkLoadReadOnlyException() throws IOException {
-    bulkLoadReadOnlyController.preCleanupBulkLoad(ctx);
+  @Test
+  public void testPreCleanupBulkLoadReadOnlyException() {
+    assertThrows(WriteAttemptedOnReadOnlyClusterException.class, () -> {
+      bulkLoadReadOnlyController.preCleanupBulkLoad(ctx);
+    });
   }
 }

hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestReadOnlyControllerEndpointObserver.java

@@ -17,11 +17,11 @@
  */
 package org.apache.hadoop.hbase.security.access;
 
+import static org.junit.Assert.assertThrows;
 import static org.mockito.Mockito.mock;
 
-import java.io.IOException;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.WriteAttemptedOnReadOnlyClusterException;
 import org.apache.hadoop.hbase.coprocessor.ObserverContext;
 import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
 import org.apache.hadoop.hbase.testclassification.SecurityTests;
@@ -68,8 +68,10 @@ public void tearDown() throws Exception {
 
   }
 
-  @Test(expected = DoNotRetryIOException.class)
-  public void testPreEndpointInvocationReadOnlyException() throws IOException {
-    endpointReadOnlyController.preEndpointInvocation(ctx, service, methodName, request);
+  @Test
+  public void testPreEndpointInvocationReadOnlyException() {
+    assertThrows(WriteAttemptedOnReadOnlyClusterException.class, () -> {
+      endpointReadOnlyController.preEndpointInvocation(ctx, service, methodName, request);
+    });
   }
 }