Skip to content

Closes #52. Fix a bug in -help option processing in the client. #55

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
xkrogen merged 1 commit into from
Sep 7, 2018
Merged

Closes #52. Fix a bug in -help option processing in the client. #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions dynamometer-infra/src/main/java/com/linkedin/dynamometer/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
Expand Down Expand Up @@ -309,7 +310,9 @@ public Client(String appMasterJar) {
* Helper function to print out usage
*/
private void printUsage() {
new HelpFormatter().printHelp("Client", opts);
HelpFormatter formatter = new HelpFormatter();
formatter.setWidth(100); // Option names are long so increasing the width is helpful
formatter.printHelp("Client", opts);
}

/**
Expand All @@ -320,17 +323,14 @@ private void printUsage() {
*/
public boolean init(String[] args) throws ParseException, IOException {

CommandLine cliParser = new GnuParser().parse(opts, args);

if (args.length == 0) {
throw new IllegalArgumentException("No args specified for client to initialize");
}

if (cliParser.hasOption("help")) {
CommandLineParser parser = new GnuParser();
if (parser.parse(new Options().addOption("h", "help", false, "Shows this message."), args, true).hasOption("h")) {
printUsage();
return false;
}

CommandLine cliParser = parser.parse(opts, args);

yarnClient = YarnClient.createYarnClient();
yarnClient.init(getConf());

Expand Down