Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-12002. Ozone : SCM cli misc fixes/improvements. Contributed by Chen Liang.

This commit is contained in:
Weiwei Yang 2017-07-01 15:22:22 +08:00 committed by Owen O'Malley
parent c567e6766b
commit 4b63e3e504
5 changed files with 79 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/cli/container/ContainerCommandHandler.java
View File

@ -92,9 +92,9 @@ public class ContainerCommandHandler extends OzoneCommandHandler {
Option createContainer =
new Option(CONTAINER_CREATE, false, "Create container");
Option infoContainer =
new Option(CONTAINER_INFO, true, "Info container");
new Option(CONTAINER_INFO, false, "Info container");
Option deleteContainer =
new Option(CONTAINER_DELETE, true, "Delete container");
new Option(CONTAINER_DELETE, false, "Delete container");
options.addOption(createContainer);
options.addOption(deleteContainer);
@ -107,6 +107,7 @@ public class ContainerCommandHandler extends OzoneCommandHandler {
// for create container options.
CreateContainerHandler.addOptions(options);
DeleteContainerHandler.addOptions(options);
InfoContainerHandler.addOptions(options);
// TODO : add other options such as delete, close etc.
}
}

24
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/cli/container/DeleteContainerHandler.java
View File

@ -30,14 +30,16 @@ import org.apache.hadoop.scm.container.common.helpers.Pipeline;
import java.io.IOException;
import static org.apache.hadoop.ozone.scm.cli.SCMCLI.CMD_WIDTH;
import static org.apache.hadoop.ozone.scm.cli.SCMCLI.HELP_OP;
/**
* This is the handler that process delete container command.
*/
public class DeleteContainerHandler extends OzoneCommandHandler {
protected static final String CONTAINER_DELETE = "del";
protected static final String CONTAINER_DELETE = "delete";
protected static final String OPT_FORCE = "f";
protected static final String OPT_CONTAINER_NAME = "c";
public DeleteContainerHandler(ScmClient scmClient) {
super(scmClient);
@ -46,9 +48,17 @@ public class DeleteContainerHandler extends OzoneCommandHandler {
@Override
public void execute(CommandLine cmd) throws IOException {
Preconditions.checkArgument(cmd.hasOption(CONTAINER_DELETE),
"Expecting command del");
"Expecting command delete");
if (!cmd.hasOption(OPT_CONTAINER_NAME)) {
displayHelp();
if (!cmd.hasOption(HELP_OP)) {
throw new IOException("Expecting container name");
} else {
return;
}
}
String containerName = cmd.getOptionValue(CONTAINER_DELETE);
String containerName = cmd.getOptionValue(OPT_CONTAINER_NAME);
Pipeline pipeline = getScmClient().getContainer(containerName);
if (pipeline == null) {
@ -61,11 +71,12 @@ public class DeleteContainerHandler extends OzoneCommandHandler {
logOut("Container %s deleted.", containerName);
}
@Override public void displayHelp() {
@Override
public void displayHelp() {
Options options = new Options();
addOptions(options);
HelpFormatter helpFormatter = new HelpFormatter();
helpFormatter.printHelp(CMD_WIDTH, "hdfs scm -container -del <option>",
helpFormatter.printHelp(CMD_WIDTH, "hdfs scm -container -delete <option>",
"where <option> is", options, "");
}
@ -74,5 +85,8 @@ public class DeleteContainerHandler extends OzoneCommandHandler {
false,
"forcibly delete a container");
options.addOption(forceOpt);
Option containerNameOpt = new Option(OPT_CONTAINER_NAME,
true, "Specify container name");
options.addOption(containerNameOpt);
}
}

27
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/cli/container/InfoContainerHandler.java
View File

@ -20,6 +20,7 @@ package org.apache.hadoop.ozone.scm.cli.container;
import com.google.common.base.Preconditions;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.hadoop.hdfs.ozone.protocol.proto.ContainerProtos.ContainerData;
@ -31,12 +32,16 @@ import org.apache.hadoop.scm.container.common.helpers.Pipeline;
import java.io.IOException;
import java.util.stream.Collectors;
import static org.apache.hadoop.ozone.scm.cli.SCMCLI.CMD_WIDTH;
import static org.apache.hadoop.ozone.scm.cli.SCMCLI.HELP_OP;
/**
* This is the handler that process container info command.
*/
public class InfoContainerHandler extends OzoneCommandHandler {
public static final String CONTAINER_INFO = "info";
protected static final String OPT_CONTAINER_NAME = "c";
/**
* Constructs a handler object.
@ -52,7 +57,15 @@ public class InfoContainerHandler extends OzoneCommandHandler {
if (!cmd.hasOption(CONTAINER_INFO)) {
throw new IOException("Expecting container info");
}
String containerName = cmd.getOptionValue(CONTAINER_INFO);
if (!cmd.hasOption(OPT_CONTAINER_NAME)) {
displayHelp();
if (!cmd.hasOption(HELP_OP)) {
throw new IOException("Expecting container name");
} else {
return;
}
}
String containerName = cmd.getOptionValue(OPT_CONTAINER_NAME);
Pipeline pipeline = getScmClient().getContainer(containerName);
Preconditions.checkNotNull(pipeline, "Pipeline cannot be null");
@ -84,8 +97,16 @@ public class InfoContainerHandler extends OzoneCommandHandler {
@Override
public void displayHelp() {
Options options = new Options();
addOptions(options);
HelpFormatter helpFormatter = new HelpFormatter();
helpFormatter.printHelp("hdfs scm -container -info <container name>",
new Options());
helpFormatter.printHelp(CMD_WIDTH, "hdfs scm -container -info <option>",
"where <option> is", options, "");
}
public static void addOptions(Options options) {
Option containerNameOpt = new Option(OPT_CONTAINER_NAME,
true, "Specify container name");
options.addOption(containerNameOpt);
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/ozShell/Shell.java
View File

@ -110,6 +110,7 @@ public class Shell extends Configured implements Tool {
try {
res = ToolRunner.run(shell, argv);
} catch (Exception ex) {
System.err.println("ERROR: " + ex.getMessage());
System.exit(1);
}
System.exit(res);

43
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java
View File

@ -164,7 +164,7 @@ public class TestSCMCli {
Assert.assertTrue(containerExist(containerName));
// Gracefully delete a container should fail because it is open.
delCmd = new String[] {"-container", "-del", containerName};
delCmd = new String[] {"-container", "-delete", "-c", containerName};
testErr = new ByteArrayOutputStream();
exitCode = runCommandAndGetOutput(delCmd, null, testErr);
assertEquals(ResultCode.EXECUTION_ERROR, exitCode);
@ -184,7 +184,7 @@ public class TestSCMCli {
Assert.assertTrue(containerExist(containerName));
// Try force delete again.
delCmd = new String[] {"-container", "-del", containerName, "-f"};
delCmd = new String[] {"-container", "-delete", "-c", containerName, "-f"};
exitCode = runCommandAndGetOutput(delCmd, null, null);
assertEquals(ResultCode.SUCCESS, exitCode);
Assert.assertFalse(containerExist(containerName));
@ -201,7 +201,7 @@ public class TestSCMCli {
Assert.assertTrue(containerExist(containerName));
// Successfully delete an empty container.
delCmd = new String[] {"-container", "-del", containerName};
delCmd = new String[] {"-container", "-delete", "-c", containerName};
exitCode = runCommandAndGetOutput(delCmd, null, null);
assertEquals(ResultCode.SUCCESS, exitCode);
Assert.assertFalse(containerExist(containerName));
@ -216,7 +216,7 @@ public class TestSCMCli {
// 3. Test to delete a non-exist container.
// ****************************************
containerName = "non-exist-container";
delCmd = new String[] {"-container", "-del", containerName};
delCmd = new String[] {"-container", "-delete", "-c", containerName};
testErr = new ByteArrayOutputStream();
exitCode = runCommandAndGetOutput(delCmd, null, testErr);
assertEquals(ResultCode.EXECUTION_ERROR, exitCode);
@ -259,7 +259,7 @@ public class TestSCMCli {
ContainerData data = new ContainerData(cname);
containerManager.createContainer(pipeline, data);
info = new String[]{"-container", "-info", cname};
info = new String[]{"-container", "-info", "-c", cname};
ByteArrayOutputStream out = new ByteArrayOutputStream();
exitCode = runCommandAndGetOutput(info, out, null);
assertEquals(ResultCode.SUCCESS, exitCode);
@ -280,7 +280,7 @@ public class TestSCMCli {
KeyUtils.getDB(data, conf).put(cname.getBytes(),
"someKey".getBytes());
info = new String[]{"-container", "-info", cname};
info = new String[]{"-container", "-info", "-c", cname};
exitCode = runCommandAndGetOutput(info, out, null);
assertEquals(ResultCode.SUCCESS, exitCode);
@ -307,7 +307,7 @@ public class TestSCMCli {
.collect(Collectors.toList());
String metadataStr = StringUtils.join(", ", metaList);
info = new String[]{"-container", "-info", cname};
info = new String[]{"-container", "-info", "-c", cname};
exitCode = runCommandAndGetOutput(info, out, null);
assertEquals(ResultCode.SUCCESS, exitCode);
@ -322,7 +322,7 @@ public class TestSCMCli {
// Close last container and test info again.
containerManager.closeContainer(cname);
info = new String[]{"-container", "-info", cname};
info = new String[]{"-container", "-info", "-c", cname};
exitCode = runCommandAndGetOutput(info, out, null);
assertEquals(ResultCode.SUCCESS, exitCode);
data = containerManager.readContainer(cname);
@ -375,9 +375,9 @@ public class TestSCMCli {
String expected1 =
"usage: hdfs scm -container <commands> <options>\n" +
"where <commands> can be one of the following\n" +
" -create Create container\n" +
" -del <arg> Delete container\n" +
" -info <arg> Info container\n";
" -create Create container\n" +
" -delete Delete container\n" +
" -info Info container\n";
assertEquals(expected1, testContent.toString());
testContent.reset();
@ -389,6 +389,27 @@ public class TestSCMCli {
"where <option> is\n" +
" -c <arg> Specify container name\n";
assertEquals(expected2, testContent.toString());
testContent.reset();
String[] args3 = {"-container", "-delete", "-help"};
assertEquals(ResultCode.SUCCESS, cli.run(args3));
String expected3 =
"usage: hdfs scm -container -delete <option>\n" +
"where <option> is\n" +
" -c <arg> Specify container name\n" +
" -f forcibly delete a container\n";
assertEquals(expected3, testContent.toString());
testContent.reset();
String[] args4 = {"-container", "-info", "-help"};
assertEquals(ResultCode.SUCCESS, cli.run(args4));
String expected4 =
"usage: hdfs scm -container -info <option>\n" +
"where <option> is\n" +
" -c <arg> Specify container name\n";
assertEquals(expected4, testContent.toString());
testContent.reset();
System.setOut(init);
}
}