You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by so...@apache.org on 2022/04/27 08:24:16 UTC
[ozone] branch master updated: Revert "HDDS-6579. Add commandline argument for Container Info command. (#3306)" (#3336)
This is an automated email from the ASF dual-hosted git repository.
sodonnell 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 73d4876dfe Revert "HDDS-6579. Add commandline argument for Container Info command. (#3306)" (#3336)
73d4876dfe is described below
commit 73d4876dfe00bf4da9f2a902056ce15499d7daa2
Author: Stephen O'Donnell <st...@gmail.com>
AuthorDate: Wed Apr 27 09:24:10 2022 +0100
Revert "HDDS-6579. Add commandline argument for Container Info command. (#3306)" (#3336)
This reverts commit 141ced1196d42330026148036e85f32317e011a4.
---
.../org/apache/hadoop/hdds/scm/cli/container/InfoSubcommand.java | 7 +------
.../apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/InfoSubcommand.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/InfoSubcommand.java
index 37bea18e89..25ed0e5df5 100644
--- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/InfoSubcommand.java
+++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/InfoSubcommand.java
@@ -63,11 +63,6 @@ public class InfoSubcommand extends ScmSubcommand {
description = "Format output as JSON")
private boolean json;
- @CommandLine.Option(names = { "--replicas" },
- defaultValue = "false",
- description = "Adds replica related details")
- private boolean addReplicaDetails;
-
@Parameters(description = "Decimal id of the container.")
private long containerID;
@@ -108,7 +103,7 @@ public class InfoSubcommand extends ScmSubcommand {
LOG.info("Datanodes: [{}]", machinesStr);
// Print the replica details if available
- if (addReplicaDetails && replicas != null) {
+ if (replicas != null) {
String replicaStr = replicas.stream().map(
InfoSubcommand::buildReplicaDetails)
.collect(Collectors.joining(",\n"));
diff --git a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
index c6040191b7..10b5758f44 100644
--- a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
+++ b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
@@ -97,7 +97,7 @@ public class TestInfoSubCommand {
.thenReturn(getReplicas(includeIndex));
cmd = new InfoSubcommand();
CommandLine c = new CommandLine(cmd);
- c.parseArgs("1", "--replicas");
+ c.parseArgs("1");
cmd.execute(scmClient);
// Ensure we have a line for Replicas:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org