HDDS-64. OzoneClientException should extend IOException. (apache#7403)

aswinshakil · Nov 12, 2024 · 47c2409 · 47c2409
1 parent 27fcd0c
commit 47c2409
Show file tree

Hide file tree

Showing 31 changed files with 47 additions and 77 deletions.
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientException.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientException.java
@@ -17,10 +17,12 @@
  */
 package org.apache.hadoop.ozone.client;
 
+import java.io.IOException;
+
 /**
  * This exception is thrown by the Ozone Clients.
  */
-public class OzoneClientException extends Exception {
+public class OzoneClientException extends IOException {
   public OzoneClientException() {
   }
 
@@ -36,8 +38,4 @@ public OzoneClientException(Throwable throwable) {
     super(throwable);
   }
 
-  public OzoneClientException(String s, Throwable throwable, boolean b,
-      boolean b1) {
-    super(s, throwable, b, b1);
-  }
 }
diff --git a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestOzoneClient.java b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestOzoneClient.java
@@ -117,7 +117,7 @@ public void testDeleteVolume()
 
   @Test
   public void testCreateVolumeWithMetadata()
-      throws IOException, OzoneClientException {
+      throws IOException {
     String volumeName = UUID.randomUUID().toString();
     VolumeArgs volumeArgs = VolumeArgs.newBuilder()
         .addMetadata("key1", "val1")

diff --git a/hadoop-ozone/dist/src/main/smoketest/om-ratis/testOMAdminCmd.robot b/hadoop-ozone/dist/src/main/smoketest/om-ratis/testOMAdminCmd.robot
@@ -22,5 +22,5 @@ Test Timeout        5 minutes
 *** Test Cases ***
 
 Check om admin command
-    ${result} =        Execute and checkrc              ozone admin om roles -id=omServiceIdDefault  0
+    ${result} =        Execute and ignore error         ozone admin om roles -id=omServiceIdDefault
                        Should Contain                   ${result}  This command works only on OzoneManager HA cluster.
diff --git a/...ntegration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java b/...ntegration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
@@ -90,7 +90,6 @@
 import org.apache.hadoop.ozone.client.ObjectStore;
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.client.OzoneClientFactory;
 import org.apache.hadoop.ozone.client.OzoneKey;
 import org.apache.hadoop.ozone.client.OzoneKeyDetails;
@@ -624,7 +623,7 @@ public void testDeleteVolume()
 
   @Test
   public void testCreateVolumeWithMetadata()
-      throws IOException, OzoneClientException {
+      throws IOException {
     String volumeName = UUID.randomUUID().toString();
     VolumeArgs volumeArgs = VolumeArgs.newBuilder()
         .addMetadata("key1", "val1")
@@ -639,7 +638,7 @@ public void testCreateVolumeWithMetadata()
 
   @Test
   public void testCreateBucketWithMetadata()
-      throws IOException, OzoneClientException {
+      throws IOException {
     String volumeName = UUID.randomUUID().toString();
     String bucketName = UUID.randomUUID().toString();
     store.createVolume(volumeName);

diff --git a/...ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java b/...ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java
@@ -22,7 +22,6 @@
 import org.apache.hadoop.hdds.cli.HddsVersionProvider;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 import org.apache.hadoop.hdds.server.JsonUtils;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRoleInfo;
 import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
 import org.apache.hadoop.ozone.om.helpers.ServiceInfo;
@@ -94,8 +93,6 @@ public Void call() throws Exception {
       } else {
         printOmServerRoles(ozoneManagerClient.getServiceList());
       }
-    } catch (OzoneClientException ex) {
-      System.out.printf("Error: %s", ex.getMessage());
     } finally {
       if (ozoneManagerClient != null) {
         ozoneManagerClient.close();

diff --git a/...op-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/UpdateRangerSubcommand.java b/...op-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/UpdateRangerSubcommand.java
@@ -20,7 +20,6 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.hdds.cli.HddsVersionProvider;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
 import picocli.CommandLine;
 
@@ -86,9 +85,6 @@ public Void call() throws Exception {
         System.err.println("Operation completed with errors. "
             + "Check OM log for details");
       }
-
-    } catch (OzoneClientException ex) {
-      System.err.printf("Error: %s", ex.getMessage());
     }
     return null;
   }

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/ChunkKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/ChunkKeyHandler.java
@@ -41,7 +41,6 @@
 import org.apache.hadoop.hdds.server.JsonUtils;
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion;
 import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
@@ -74,7 +73,7 @@ private String getChunkLocationPath(String containerLocation) {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-          throws IOException, OzoneClientException {
+          throws IOException {
     try (ContainerOperationClient containerOperationClient = new ContainerOperationClient(parent.getOzoneConf());
         XceiverClientManager xceiverClientManager = containerOperationClient.getXceiverClientManager()) {
       OzoneManagerProtocol ozoneManagerClient = client.getObjectStore().getClientProxy().getOzoneManagerClient();

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/CompactionLogDagPrinter.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/CompactionLogDagPrinter.java
@@ -20,7 +20,6 @@
 
 import org.apache.hadoop.hdds.cli.SubcommandWithParent;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.shell.Handler;
 import org.apache.hadoop.ozone.shell.OzoneAddress;
 import org.kohsuke.MetaInfServices;
@@ -63,7 +62,7 @@ public Class<?> getParentType() {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
     String message = client.getObjectStore()
         .printCompactionLogDag(fileNamePrefix, graphType);
     System.out.println(message);

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/ReadReplicas.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/ReadReplicas.java
@@ -24,7 +24,6 @@
 import org.apache.hadoop.hdds.server.JsonUtils;
 import org.apache.hadoop.hdds.utils.IOUtils;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.client.OzoneKeyDetails;
 import org.apache.hadoop.ozone.client.io.OzoneInputStream;
 import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
@@ -90,7 +89,7 @@ public Class<?> getParentType() {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
 
     address.ensureKeyAddress();
 

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Handler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Handler.java
@@ -69,7 +69,7 @@ protected OzoneAddress getAddress() throws OzoneClientException {
   }
 
   protected abstract void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException;
+      throws IOException;
 
   /**
    * Checks whether the current command should be executed or not.
@@ -102,7 +102,7 @@ public Void call() throws Exception {
   }
 
   protected OzoneClient createClient(OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
     return address.createClient(conf);
   }
 

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneAddress.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneAddress.java
@@ -123,7 +123,7 @@ protected OzoneClient createRpcClientFromServiceId(
   }
 
   public OzoneClient createClient(MutableConfigurationSource conf)
-      throws IOException, OzoneClientException {
+      throws IOException {
     OzoneClient client;
     String scheme = ozoneURI.getScheme();
     if (ozoneURI.getScheme() == null || scheme.isEmpty()) {
@@ -185,13 +185,12 @@ public OzoneClient createClient(MutableConfigurationSource conf)
    * @param omServiceID
    * @return OzoneClient
    * @throws IOException
-   * @throws OzoneClientException
    */
   public OzoneClient createClientForS3Commands(
       OzoneConfiguration conf,
       String omServiceID
   )
-      throws IOException, OzoneClientException {
+      throws IOException {
     Collection<String> serviceIds = conf.
         getTrimmedStringCollection(OZONE_OM_SERVICE_IDS_KEY);
     if (omServiceID != null) {
@@ -227,8 +226,7 @@ public OzoneClient createClientForS3Commands(
    * @param uri - UriString
    * @return URI
    */
-  protected URI parseURI(String uri)
-      throws OzoneClientException {
+  protected URI parseURI(String uri) throws OzoneClientException {
     if ((uri == null) || uri.isEmpty()) {
       throw new OzoneClientException(
           "Ozone URI is needed to execute this command.");
@@ -422,7 +420,7 @@ public void ensureVolumeAddress() throws OzoneClientException {
     }
   }
 
-  public void ensureRootAddress() throws OzoneClientException {
+  public void ensureRootAddress() throws  OzoneClientException {
     if (keyName.length() != 0 || bucketName.length() != 0
         || volumeName.length() != 0) {
       throw new OzoneClientException(

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetEncryptionKey.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetEncryptionKey.java
@@ -19,7 +19,6 @@
 
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.shell.OzoneAddress;
 import picocli.CommandLine;
 
@@ -70,7 +69,7 @@ public class SetEncryptionKey extends BucketHandler {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
 
     String volumeName = address.getVolumeName();
     String bucketName = address.getBucketName();

diff --git a/...tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetReplicationConfigHandler.java b/...tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetReplicationConfigHandler.java
@@ -21,7 +21,6 @@
 import org.apache.hadoop.ozone.OzoneIllegalArgumentException;
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.shell.OzoneAddress;
 import org.apache.hadoop.ozone.shell.ShellReplicationOptions;
 import picocli.CommandLine;
@@ -40,7 +39,7 @@ public class SetReplicationConfigHandler extends BucketHandler {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
     ReplicationConfig replicationConfig = replication.fromParams(getConf())
         .orElseThrow(() -> new OzoneIllegalArgumentException(
             "Replication type and config must be specified."));

diff --git a/...p-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/UpdateBucketHandler.java b/...p-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/UpdateBucketHandler.java
@@ -19,7 +19,6 @@
 
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.shell.OzoneAddress;
 
 import picocli.CommandLine.Command;
@@ -40,7 +39,7 @@ public class UpdateBucketHandler extends BucketHandler {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
 
     String volumeName = address.getVolumeName();
     String bucketName = address.getBucketName();

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/CatKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/CatKeyHandler.java
@@ -21,7 +21,6 @@
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.client.OzoneVolume;
 import org.apache.hadoop.ozone.shell.OzoneAddress;
 import picocli.CommandLine.Command;
@@ -38,7 +37,7 @@ public class CatKeyHandler extends KeyHandler {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
 
     String volumeName = address.getVolumeName();
     String bucketName = address.getBucketName();

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/ChecksumKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/ChecksumKeyHandler.java
@@ -22,7 +22,6 @@
 import org.apache.hadoop.hdds.scm.OzoneClientConfig;
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.client.OzoneKeyDetails;
 import org.apache.hadoop.ozone.client.OzoneVolume;
 import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
@@ -49,7 +48,7 @@ public class ChecksumKeyHandler extends KeyHandler {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
 
     ChecksumInfo checksumInfo = new ChecksumInfo(address, client, mode);
     printObjectAsJson(checksumInfo);

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/CopyKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/CopyKeyHandler.java
@@ -29,7 +29,6 @@
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.client.OzoneKeyDetails;
 import org.apache.hadoop.ozone.client.OzoneVolume;
 import org.apache.hadoop.ozone.shell.OzoneAddress;
@@ -64,7 +63,7 @@ public class CopyKeyHandler extends BucketHandler {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
 
     String volumeName = address.getVolumeName();
     String bucketName = address.getBucketName();

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/DeleteKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/DeleteKeyHandler.java
@@ -22,7 +22,6 @@
 import org.apache.hadoop.ozone.OmUtils;
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.client.OzoneKeyDetails;
 import org.apache.hadoop.ozone.client.OzoneVolume;
 import org.apache.hadoop.ozone.om.exceptions.OMException;
@@ -55,7 +54,7 @@ public class DeleteKeyHandler extends KeyHandler {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
 
     String volumeName = address.getVolumeName();
     String bucketName = address.getBucketName();

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/GetKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/GetKeyHandler.java
@@ -61,7 +61,7 @@ public class GetKeyHandler extends KeyHandler {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
 
     String volumeName = address.getVolumeName();
     String bucketName = address.getBucketName();

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/ListKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/ListKeyHandler.java
@@ -24,7 +24,6 @@
 import com.google.common.base.Strings;
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.client.OzoneKey;
 import org.apache.hadoop.ozone.client.OzoneVolume;
 import org.apache.hadoop.ozone.shell.ListOptions;
@@ -47,7 +46,7 @@ public class ListKeyHandler extends VolumeBucketHandler {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
 
     if (!Strings.isNullOrEmpty(address.getBucketName())) {
       listKeysInsideBucket(client, address);

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/PutKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/PutKeyHandler.java
@@ -37,7 +37,6 @@
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.client.OzoneVolume;
 import org.apache.hadoop.ozone.client.io.OzoneDataStreamOutput;
 import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
@@ -75,7 +74,7 @@ public class PutKeyHandler extends KeyHandler {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
 
     String volumeName = address.getVolumeName();
     String bucketName = address.getBucketName();

diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/RenameKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/RenameKeyHandler.java
@@ -19,7 +19,6 @@
 
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneClientException;
 import org.apache.hadoop.ozone.client.OzoneVolume;
 import org.apache.hadoop.ozone.shell.OzoneAddress;
 import org.apache.hadoop.ozone.shell.bucket.BucketHandler;
@@ -46,7 +45,7 @@ public class RenameKeyHandler extends BucketHandler {
 
   @Override
   protected void execute(OzoneClient client, OzoneAddress address)
-      throws IOException, OzoneClientException {
+      throws IOException {
 
     String volumeName = address.getVolumeName();
     String bucketName = address.getBucketName();