Skip to content

HDDS-4064. Show container verbose info with verbose option #1290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoyuyao merged 8 commits into from
Sep 8, 2020
Merged

HDDS-4064. Show container verbose info with verbose option #1290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
142947d
HDDS-4064. Show container verbose info with verbose option
maobaolong Aug 5, 2020
b175bc5
Use GenericParentCommand to get the verbose mode
maobaolong Aug 27, 2020
33c9d49
Use GenericParentCommand to get the verbose mode
maobaolong Aug 27, 2020
f4c0dda
Merge remote-tracking branch 'origin/master' into infocontainer
adoroszlai Aug 27, 2020
738c834
HDDS-4064. Add robot test for verbose mode
adoroszlai Aug 27, 2020
ee4b45c
HDDS-4064. Fix checkstyle
adoroszlai Aug 27, 2020
4dffd17
trigger new CI check
adoroszlai Aug 27, 2020
1d05504
Merge remote-tracking branch 'upstream' into infocontainer
maobaolong Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/InfoSubcommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.io.IOException;
import java.util.stream.Collectors;

import org.apache.hadoop.hdds.cli.GenericParentCommand;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.scm.cli.ScmSubcommand;
Expand All @@ -31,7 +32,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import picocli.CommandLine.Command;
import picocli.CommandLine.Model.CommandSpec;
import picocli.CommandLine.Parameters;
import picocli.CommandLine.Spec;

/**
* This is the handler that process container info command.
Expand All @@ -46,6 +49,9 @@ public class InfoSubcommand extends ScmSubcommand {
private static final Logger LOG =
LoggerFactory.getLogger(InfoSubcommand.class);

@Spec
private CommandSpec spec;

@Parameters(description = "Decimal id of the container.")
private long containerID;

Expand All @@ -57,7 +63,13 @@ public void execute(ScmClient scmClient) throws IOException {

// Print container report info.
LOG.info("Container id: {}", containerID);
LOG.info("Pipeline id: {}", container.getPipeline().getId().getId());
boolean verbose = spec.root().userObject() instanceof GenericParentCommand
&& ((GenericParentCommand) spec.root().userObject()).isVerbose();
if (verbose) {
LOG.info("Pipeline Info: {}", container.getPipeline());
} else {
LOG.info("Pipeline id: {}", container.getPipeline().getId().getId());
}
LOG.info("Container State: {}", container.getContainerInfo().getState());

// Print pipeline of an existing container.
Expand Down
5 changes: 5 additions & 0 deletions hadoop-ozone/dist/src/main/smoketest/admincli/container.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,13 @@ List containers with explicit host
Container info
${output} = Execute ozone admin container info "${CONTAINER}"
Should contain ${output} Container id: ${CONTAINER}
Should contain ${output} Pipeline id
Should contain ${output} Datanodes

Verbose container info
${output} = Execute ozone admin --verbose container info "${CONTAINER}"
Should contain ${output} Pipeline Info

Close container
Execute ozone admin container close "${CONTAINER}"
${output} = Execute ozone admin container info "${CONTAINER}"
Expand Down