This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 47c2409d2f HDDS-64. OzoneClientException should extend IOException.
(#7403)
47c2409d2f is described below
commit 47c2409d2f58b40f7d3661ea796d1348fbd8e093
Author: Nandakumar Vadivelu <[email protected]>
AuthorDate: Wed Nov 13 03:12:09 2024 +0530
HDDS-64. OzoneClientException should extend IOException. (#7403)
---
.../hadoop/ozone/client/OzoneClientException.java | 8 +++-----
.../hadoop/ozone/client/TestOzoneClient.java | 2 +-
.../main/smoketest/om-ratis/testOMAdminCmd.robot | 2 +-
.../ozone/client/rpc/OzoneRpcClientTests.java | 5 ++---
.../ozone/admin/om/GetServiceRolesSubcommand.java | 3 ---
.../ozone/admin/om/UpdateRangerSubcommand.java | 4 ----
.../apache/hadoop/ozone/debug/ChunkKeyHandler.java | 3 +--
.../ozone/debug/CompactionLogDagPrinter.java | 3 +--
.../apache/hadoop/ozone/debug/ReadReplicas.java | 3 +--
.../org/apache/hadoop/ozone/shell/Handler.java | 4 ++--
.../apache/hadoop/ozone/shell/OzoneAddress.java | 10 ++++-----
.../ozone/shell/bucket/SetEncryptionKey.java | 3 +--
.../shell/bucket/SetReplicationConfigHandler.java | 3 +--
.../ozone/shell/bucket/UpdateBucketHandler.java | 3 +--
.../hadoop/ozone/shell/keys/CatKeyHandler.java | 3 +--
.../ozone/shell/keys/ChecksumKeyHandler.java | 3 +--
.../hadoop/ozone/shell/keys/CopyKeyHandler.java | 3 +--
.../hadoop/ozone/shell/keys/DeleteKeyHandler.java | 3 +--
.../hadoop/ozone/shell/keys/GetKeyHandler.java | 2 +-
.../hadoop/ozone/shell/keys/ListKeyHandler.java | 3 +--
.../hadoop/ozone/shell/keys/PutKeyHandler.java | 3 +--
.../hadoop/ozone/shell/keys/RenameKeyHandler.java | 3 +--
.../hadoop/ozone/shell/keys/RewriteKeyHandler.java | 3 +--
.../apache/hadoop/ozone/shell/s3/S3Handler.java | 2 +-
.../shell/snapshot/RenameSnapshotHandler.java | 3 +--
.../hadoop/ozone/shell/tenant/TenantHandler.java | 2 +-
.../ozone/shell/token/CancelTokenHandler.java | 3 +--
.../hadoop/ozone/shell/token/GetTokenHandler.java | 2 +-
.../ozone/shell/token/RenewTokenHandler.java | 3 +--
.../shell/TestOzoneAddressClientCreation.java | 24 +++++++++++-----------
.../ozone/shell/keys/TestChecksumKeyHandler.java | 3 +--
31 files changed, 47 insertions(+), 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
index 2e9080a66f..e2d87921b5 100644
---
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 class OzoneClientException extends Exception {
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
index 09a6c0a5c0..e03fa461cc 100644
---
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 class TestOzoneClient {
@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
index 0c68886519..3977e05360 100644
--- 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/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
index 6edef789b1..5d006e47e7 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
@@ -90,7 +90,6 @@ import org.apache.hadoop.ozone.client.BucketArgs;
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 @@ abstract class OzoneRpcClientTests extends OzoneTestBase {
@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 @@ abstract class OzoneRpcClientTests extends OzoneTestBase {
@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/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java
index bdeba91e41..2b23ad9f53 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java
@@ -22,7 +22,6 @@ import org.apache.hadoop.classification.VisibleForTesting;
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 class GetServiceRolesSubcommand implements
Callable<Void> {
} else {
printOmServerRoles(ozoneManagerClient.getServiceList());
}
- } catch (OzoneClientException ex) {
- System.out.printf("Error: %s", ex.getMessage());
} finally {
if (ozoneManagerClient != null) {
ozoneManagerClient.close();
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/UpdateRangerSubcommand.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/UpdateRangerSubcommand.java
index 4234ee29d1..d2d2f1bf04 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/UpdateRangerSubcommand.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/UpdateRangerSubcommand.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.ozone.admin.om;
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 class UpdateRangerSubcommand implements Callable<Void>
{
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
index b5b2364007..fe114947f2 100644
---
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.scm.storage.ContainerProtocolCalls;
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 @@ public class ChunkKeyHandler extends KeyHandler implements
@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
index 18c13d67cf..91d033729a 100644
---
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 @@ package org.apache.hadoop.ozone.debug;
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 CompactionLogDagPrinter extends Handler
@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
index 48ed7c74ae..fd93d75cd5 100644
---
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.protocol.DatanodeDetails;
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 ReadReplicas extends KeyHandler implements
SubcommandWithParent {
@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
index ae5edf5b1f..92484936f2 100644
---
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 @@ public abstract class Handler implements Callable<Void> {
}
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 abstract class Handler implements Callable<Void> {
}
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
index f2fa1a8c4f..ae5b5ad566 100644
---
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 @@ public class OzoneAddress {
}
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 class OzoneAddress {
* @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 class OzoneAddress {
* @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 class OzoneAddress {
}
}
- 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
index 86a50e9df3..3df65165fa 100644
---
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 @@ package org.apache.hadoop.ozone.shell.bucket;
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/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetReplicationConfigHandler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetReplicationConfigHandler.java
index 45d66fd1c3..258a73aa93 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetReplicationConfigHandler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetReplicationConfigHandler.java
@@ -21,7 +21,6 @@ import org.apache.hadoop.hdds.client.ReplicationConfig;
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/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/UpdateBucketHandler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/UpdateBucketHandler.java
index 7ba62a5ce1..e36fbce63e 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/UpdateBucketHandler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/UpdateBucketHandler.java
@@ -19,7 +19,6 @@ package org.apache.hadoop.ozone.shell.bucket;
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
index 328c56f82e..41a3e142a8 100644
---
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 @@ package org.apache.hadoop.ozone.shell.keys;
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
index b8acf783d6..6bb25dc2ad 100644
---
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.fs.FileChecksum;
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
index 81d2dbcae6..a304dada15 100644
---
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.io.IOUtils;
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
index 4c795f1e82..a67343976e 100644
---
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.fs.Path;
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
index 501a64238f..c01f93da9c 100644
---
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
index 00652b58a9..c96e5e2b59 100644
---
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 java.util.Iterator;
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
index 35095dd7ff..30543f7907 100644
---
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.io.IOUtils;
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
index f71ac094fa..e48f080496 100644
---
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 @@ package org.apache.hadoop.ozone.shell.keys;
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();
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/RewriteKeyHandler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/RewriteKeyHandler.java
index 35e8da5f38..3dead7a979 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/RewriteKeyHandler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/RewriteKeyHandler.java
@@ -21,7 +21,6 @@ import org.apache.hadoop.hdds.client.ReplicationConfig;
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.OzoneKeyDetails;
import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.shell.MandatoryReplicationOptions;
@@ -45,7 +44,7 @@ public class RewriteKeyHandler extends KeyHandler {
private MandatoryReplicationOptions replication;
@Override
- protected void execute(OzoneClient client, OzoneAddress address) throws
IOException, OzoneClientException {
+ protected void execute(OzoneClient client, OzoneAddress address) throws
IOException {
String volumeName = address.getVolumeName();
String bucketName = address.getBucketName();
String keyName = address.getKeyName();
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Handler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Handler.java
index 91cde308cb..62b36230fc 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Handler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Handler.java
@@ -49,7 +49,7 @@ public abstract class S3Handler extends Handler {
@Override
protected OzoneClient createClient(OzoneAddress address)
- throws IOException, OzoneClientException {
+ throws IOException {
return address.createClientForS3Commands(getConf(), omServiceID);
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/snapshot/RenameSnapshotHandler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/snapshot/RenameSnapshotHandler.java
index 63b61b1ec6..f7569cac92 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/snapshot/RenameSnapshotHandler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/snapshot/RenameSnapshotHandler.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.ozone.shell.snapshot;
import java.io.IOException;
import org.apache.hadoop.ozone.OmUtils;
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.apache.hadoop.ozone.shell.bucket.BucketUri;
@@ -50,7 +49,7 @@ public class RenameSnapshotHandler extends Handler {
}
@Override
- protected void execute(OzoneClient client, OzoneAddress address) throws
IOException, OzoneClientException {
+ protected void execute(OzoneClient client, OzoneAddress address) throws
IOException {
String volumeName = snapshotPath.getValue().getVolumeName();
String bucketName = snapshotPath.getValue().getBucketName();
OmUtils.validateSnapshotName(snapshotNewName);
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantHandler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantHandler.java
index a76ab7420a..8800d22e61 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantHandler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantHandler.java
@@ -47,7 +47,7 @@ public abstract class TenantHandler extends Handler {
@Override
protected OzoneClient createClient(OzoneAddress address)
- throws IOException, OzoneClientException {
+ throws IOException {
return address.createClientForS3Commands(getConf(), omServiceID);
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/CancelTokenHandler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/CancelTokenHandler.java
index 73c9264a80..f76f88b665 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/CancelTokenHandler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/CancelTokenHandler.java
@@ -19,7 +19,6 @@
package org.apache.hadoop.ozone.shell.token;
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;
@@ -34,7 +33,7 @@ public class CancelTokenHandler extends TokenHandler {
@Override
protected void execute(OzoneClient client, OzoneAddress address)
- throws IOException, OzoneClientException {
+ throws IOException {
client.getObjectStore().cancelDelegationToken(getToken());
out().printf("Token canceled successfully.%n");
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/GetTokenHandler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/GetTokenHandler.java
index dadba506ae..133e983dd1 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/GetTokenHandler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/GetTokenHandler.java
@@ -65,7 +65,7 @@ public class GetTokenHandler extends Handler {
@Override
protected void execute(OzoneClient client, OzoneAddress address)
- throws IOException, OzoneClientException {
+ throws IOException {
Token<OzoneTokenIdentifier> token = client.getObjectStore()
.getDelegationToken(new Text(renewer.getValue()));
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/RenewTokenHandler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/RenewTokenHandler.java
index 581093050a..8b578b0f17 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/RenewTokenHandler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/RenewTokenHandler.java
@@ -19,7 +19,6 @@
package org.apache.hadoop.ozone.shell.token;
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;
@@ -35,7 +34,7 @@ public class RenewTokenHandler extends TokenHandler {
@Override
protected void execute(OzoneClient client, OzoneAddress address)
- throws IOException, OzoneClientException {
+ throws IOException {
long expiryTime = client.getObjectStore().renewDelegationToken(getToken());
out().printf("Token renewed successfully, expiry time: %s.%n",
Instant.ofEpochMilli(expiryTime));
diff --git
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddressClientCreation.java
b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddressClientCreation.java
index 620142c244..7ebb449bff 100644
---
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddressClientCreation.java
+++
b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddressClientCreation.java
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.Test;
public class TestOzoneAddressClientCreation {
@Test
- public void implicitNonHA() throws OzoneClientException, IOException {
+ public void implicitNonHA() throws IOException {
TestableOzoneAddress address =
new TestableOzoneAddress("/vol1/bucket1/key1");
address.createClient(new InMemoryConfiguration());
@@ -51,7 +51,7 @@ public class TestOzoneAddressClientCreation {
@Test
public void implicitHAOneServiceId()
- throws OzoneClientException, IOException {
+ throws IOException {
TestableOzoneAddress address =
new TestableOzoneAddress("/vol1/bucket1/key1");
address.createClient(
@@ -62,7 +62,7 @@ public class TestOzoneAddressClientCreation {
@Test
public void implicitHaMultipleServiceId()
- throws OzoneClientException, IOException {
+ throws IOException {
TestableOzoneAddress address =
new TestableOzoneAddress("/vol1/bucket1/key1");
assertThrows(OzoneClientException.class, () ->
@@ -72,7 +72,7 @@ public class TestOzoneAddressClientCreation {
@Test
public void implicitHaMultipleServiceIdWithDefaultServiceId()
- throws OzoneClientException, IOException {
+ throws IOException {
TestableOzoneAddress address =
new TestableOzoneAddress("/vol1/bucket1/key1");
InMemoryConfiguration conf = new
InMemoryConfiguration(OZONE_OM_SERVICE_IDS_KEY,
@@ -86,7 +86,7 @@ public class TestOzoneAddressClientCreation {
@Test
public void implicitHaMultipleServiceIdWithDefaultServiceIdForS3()
- throws OzoneClientException, IOException {
+ throws IOException {
TestableOzoneAddress address =
new TestableOzoneAddress("/vol1/bucket1/key1");
OzoneConfiguration conf = new OzoneConfiguration();
@@ -100,7 +100,7 @@ public class TestOzoneAddressClientCreation {
@Test
public void explicitHaMultipleServiceId()
- throws OzoneClientException, IOException {
+ throws IOException {
TestableOzoneAddress address =
new TestableOzoneAddress("o3://service1/vol1/bucket1/key1");
address.createClient(
@@ -111,7 +111,7 @@ public class TestOzoneAddressClientCreation {
}
@Test
- public void explicitNonHAHostPort() throws OzoneClientException, IOException
{
+ public void explicitNonHAHostPort() throws IOException {
TestableOzoneAddress address =
new TestableOzoneAddress("o3://om:9862/vol1/bucket1/key1");
address.createClient(new InMemoryConfiguration());
@@ -122,7 +122,7 @@ public class TestOzoneAddressClientCreation {
@Test
public void explicitHAHostPortWithServiceId()
- throws OzoneClientException, IOException {
+ throws IOException {
TestableOzoneAddress address =
new TestableOzoneAddress("o3://om:9862/vol1/bucket1/key1");
address.createClient(
@@ -134,7 +134,7 @@ public class TestOzoneAddressClientCreation {
@Test
public void explicitAHostPortWithServiceIds()
- throws OzoneClientException, IOException {
+ throws IOException {
TestableOzoneAddress address =
new TestableOzoneAddress("o3://om:9862/vol1/bucket1/key1");
address.createClient(
@@ -146,7 +146,7 @@ public class TestOzoneAddressClientCreation {
}
@Test
- public void explicitNonHAHost() throws OzoneClientException, IOException {
+ public void explicitNonHAHost() throws IOException {
TestableOzoneAddress address =
new TestableOzoneAddress("o3://om/vol1/bucket1/key1");
address.createClient(
@@ -156,7 +156,7 @@ public class TestOzoneAddressClientCreation {
}
@Test
- public void explicitHAHostPort() throws OzoneClientException, IOException {
+ public void explicitHAHostPort() throws IOException {
TestableOzoneAddress address =
new TestableOzoneAddress("o3://om:1234/vol1/bucket1/key1");
address.createClient(new InMemoryConfiguration());
@@ -166,7 +166,7 @@ public class TestOzoneAddressClientCreation {
}
@Test
- public void explicitWrongScheme() throws OzoneClientException, IOException {
+ public void explicitWrongScheme() throws IOException {
TestableOzoneAddress address =
new TestableOzoneAddress("ssh://host/vol1/bucket1/key1");
assertThrows(OzoneClientException.class, () ->
diff --git
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/keys/TestChecksumKeyHandler.java
b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/keys/TestChecksumKeyHandler.java
index d4fa929614..3b22573eb1 100644
---
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/keys/TestChecksumKeyHandler.java
+++
b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/keys/TestChecksumKeyHandler.java
@@ -24,7 +24,6 @@ import org.apache.hadoop.fs.FileChecksum;
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.OzoneKeyDetails;
import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
@@ -85,7 +84,7 @@ public class TestChecksumKeyHandler {
@Test
public void testChecksumKeyHandler()
- throws OzoneClientException, IOException {
+ throws IOException {
OzoneAddress address = new OzoneAddress("o3://ozone1/volume/bucket/key");
long keySize = 1024L;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
