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 6899ea277b HDDS-9827. Improve CLI output when trying to close unknown
container (#5790)
6899ea277b is described below
commit 6899ea277b6b4842c3985f8d77eb6e845f3bec26
Author: Tejaskriya <[email protected]>
AuthorDate: Mon Dec 18 14:31:31 2023 +0530
HDDS-9827. Improve CLI output when trying to close unknown container (#5790)
---
.../hdds/scm/container/ContainerManagerImpl.java | 6 +++--
.../hdds/scm/cli/container/CloseSubcommand.java | 26 +---------------------
.../hdds/scm/cli/container/ContainerCommands.java | 11 ---------
3 files changed, 5 insertions(+), 38 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManagerImpl.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManagerImpl.java
index 34604edb3b..8e1e881c44 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManagerImpl.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManagerImpl.java
@@ -137,7 +137,8 @@ public class ContainerManagerImpl implements
ContainerManager {
throws ContainerNotFoundException {
return Optional.ofNullable(containerStateManager
.getContainer(id))
- .orElseThrow(() -> new ContainerNotFoundException("ID " + id));
+ .orElseThrow(() -> new ContainerNotFoundException("Container with id "
+
+ id + " not found."));
}
@Override
@@ -287,7 +288,8 @@ public class ContainerManagerImpl implements
ContainerManager {
throws ContainerNotFoundException {
return Optional.ofNullable(containerStateManager
.getContainerReplicas(id))
- .orElseThrow(() -> new ContainerNotFoundException("ID " + id));
+ .orElseThrow(() -> new ContainerNotFoundException("Container with id "
+
+ id + " not found."));
}
@Override
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CloseSubcommand.java
b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CloseSubcommand.java
index 76a07a882d..c7d8672a35 100644
---
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CloseSubcommand.java
+++
b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CloseSubcommand.java
@@ -19,16 +19,10 @@ package org.apache.hadoop.hdds.scm.cli.container;
import java.io.IOException;
-import org.apache.hadoop.hdds.cli.GenericParentCommand;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.scm.cli.ScmSubcommand;
import org.apache.hadoop.hdds.scm.client.ScmClient;
-import static
org.apache.hadoop.hdds.scm.cli.container.ContainerCommands.checkContainerExists;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Parameters;
@@ -42,30 +36,12 @@ import picocli.CommandLine.Parameters;
versionProvider = HddsVersionProvider.class)
public class CloseSubcommand extends ScmSubcommand {
- private static final Logger LOG =
- LoggerFactory.getLogger(CloseSubcommand.class);
-
- @CommandLine.Spec
- private CommandLine.Model.CommandSpec spec;
-
@Parameters(description = "Id of the container to close")
private long containerId;
@Override
public void execute(ScmClient scmClient) throws IOException {
- checkContainerExists(scmClient, containerId);
- try {
- scmClient.closeContainer(containerId);
- } catch (IOException ioe) {
- boolean verbose = spec != null && spec.root()
- .userObject() instanceof GenericParentCommand &&
- ((GenericParentCommand) spec.root().userObject()).isVerbose();
- if (!verbose) {
- LOG.error("Unable to close container : {}", ioe.getMessage());
- } else {
- LOG.error("Unable to close container", ioe);
- }
- }
+ scmClient.closeContainer(containerId);
}
}
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ContainerCommands.java
b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ContainerCommands.java
index f9dfc3fd00..a3d07728eb 100644
---
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ContainerCommands.java
+++
b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ContainerCommands.java
@@ -17,15 +17,12 @@
*/
package org.apache.hadoop.hdds.scm.cli.container;
-import java.io.IOException;
import java.util.concurrent.Callable;
import org.apache.hadoop.hdds.cli.GenericCli;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.OzoneAdmin;
import org.apache.hadoop.hdds.cli.SubcommandWithParent;
-import org.apache.hadoop.hdds.scm.client.ScmClient;
-import org.apache.hadoop.hdds.scm.container.ContainerInfo;
import org.kohsuke.MetaInfServices;
import picocli.CommandLine.Command;
@@ -63,12 +60,4 @@ public class ContainerCommands implements Callable<Void>,
SubcommandWithParent {
public Class<?> getParentType() {
return OzoneAdmin.class;
}
-
- public static void checkContainerExists(ScmClient scmClient, long
containerId)
- throws IOException {
- ContainerInfo container = scmClient.getContainer(containerId);
- if (container == null) {
- throw new IllegalArgumentException("No such container " + containerId);
- }
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
