Repository: incubator-slider Updated Branches: refs/heads/develop 133f5257d -> aa273839f
SLIDER-844 Slider commands like list and package do not show help message Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/aa273839 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/aa273839 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/aa273839 Branch: refs/heads/develop Commit: aa273839fba3c0cd61c96f1f57a597c7730b2102 Parents: 133f525 Author: Gour Saha <[email protected]> Authored: Tue Apr 7 18:40:54 2015 -0700 Committer: Gour Saha <[email protected]> Committed: Tue Apr 7 18:40:54 2015 -0700 ---------------------------------------------------------------------- .../main/python/agent/CustomServiceOrchestrator.py | 1 + .../java/org/apache/slider/client/SliderClient.java | 16 ++++++++++++++-- .../slider/common/params/AbstractActionArgs.java | 2 ++ .../slider/common/params/ActionPackageArgs.java | 2 +- .../org/apache/slider/common/params/CommonArgs.java | 2 +- .../apache/slider/common/params/SliderActions.java | 10 ++++++---- .../org/apache/slider/providers/agent/State.java | 2 -- 7 files changed, 25 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aa273839/slider-agent/src/main/python/agent/CustomServiceOrchestrator.py ---------------------------------------------------------------------- diff --git a/slider-agent/src/main/python/agent/CustomServiceOrchestrator.py b/slider-agent/src/main/python/agent/CustomServiceOrchestrator.py index 084bb8d..ce0787f 100644 --- a/slider-agent/src/main/python/agent/CustomServiceOrchestrator.py +++ b/slider-agent/src/main/python/agent/CustomServiceOrchestrator.py @@ -83,6 +83,7 @@ class CustomServiceOrchestrator(): script_type = command['commandParams']['script_type'] task_id = command['taskId'] command_name = command['roleCommand'] + # transform upgrade specific command names if command_name == 'UPGRADE': command_name = 'PRE_UPGRADE' if command_name == 'UPGRADE_STOP': http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aa273839/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index ffb8909..7f1e63b 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -501,7 +501,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe case ACTION_UPDATE: exitCode = actionUpdate(clusterName, serviceArgs.getActionUpdateArgs()); break; - + case ACTION_UPGRADE: exitCode = actionUpgrade(clusterName, serviceArgs.getActionUpgradeArgs()); break; @@ -1019,7 +1019,9 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe public int actionInstallPkg(ActionInstallPackageArgs installPkgInfo) throws YarnException, IOException { - + log.warn("The " + SliderActions.ACTION_INSTALL_PACKAGE + + " option has been deprecated. Please use '" + + SliderActions.ACTION_PACKAGE + " " + ClientArgs.ARG_INSTALL + "'."); Path srcFile = null; if (StringUtils.isEmpty(installPkgInfo.name)) { throw new BadCommandArgumentsException( @@ -1205,6 +1207,9 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe throws YarnException, IOException { initializeOutputStream(actionPackageInfo.out); int exitCode = -1; + if (actionPackageInfo.help) { + exitCode = actionHelp(ACTION_PACKAGE); + } if (actionPackageInfo.install) { exitCode = actionPackageInstall(actionPackageInfo); } @@ -2413,6 +2418,9 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe @Override public int actionList(String clustername, ActionListArgs args) throws IOException, YarnException { + if (args.help) { + return actionHelp(ACTION_LIST); + } verifyBindingsDefined(); boolean live = args.live; @@ -4059,6 +4067,10 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe } return EXIT_SUCCESS; } + + private int actionHelp(String actionName) throws YarnException, IOException { + throw new UsageException(CommonArgs.usage(serviceArgs, actionName)); + } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aa273839/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java index cc80142..17c235f 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java @@ -96,6 +96,8 @@ public abstract class AbstractActionArgs extends ArgOps implements Arguments { @Parameter(names = ARG_DEBUG, description = "Debug mode") public boolean debug = false; + @Parameter(names = {ARG_HELP}, description = "Help", help = true) + public boolean help = false; /** * Get the min #of params expected http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aa273839/slider-core/src/main/java/org/apache/slider/common/params/ActionPackageArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionPackageArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionPackageArgs.java index d9fde41..4833934 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ActionPackageArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionPackageArgs.java @@ -32,7 +32,7 @@ public class ActionPackageArgs extends AbstractActionArgs { } @Parameter(names = {ARG_INSTALL}, - description = "Install package operation") + description = "Install package in the sub-folder 'package' of the user's Slider base directory") public boolean install; @Parameter(names = {ARG_PKGDELETE}, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aa273839/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java index ba9c0e3..7e02eec 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java @@ -120,7 +120,7 @@ public abstract class CommonArgs extends ArgOps implements SliderActions, serviceArgs.commander.getCommandDescription(jcommand) + "\n")); } helperMessage - .append("Most commands print help when invoked without parameters"); + .append("Most commands print help when invoked without parameters or with --help"); result = helperMessage.toString(); } else { helperMessage.append("\nUsage: slider " + commandOfInterest); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aa273839/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java b/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java index 6c34eb3..cdde8f1 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java @@ -54,7 +54,7 @@ public interface SliderActions { String DESCRIBE_ACTION_AM_SUICIDE = "Tell the Slider Application Master to simulate a process failure by terminating itself"; String DESCRIBE_ACTION_BUILD = - "Build a Slider cluster specification -but do not start it"; + "Build a Slider cluster specification, but do not start it"; String DESCRIBE_ACTION_CREATE = "Create a live Slider application"; String DESCRIBE_ACTION_UPDATE = @@ -89,10 +89,12 @@ public interface SliderActions { "Start a stopped application"; String DESCRIBE_ACTION_VERSION = "Print the Slider version information"; - String DESCRIBE_ACTION_INSTALL_PACKAGE = "Install the application package in the home directory under sub-folder packages"; - String DESCRIBE_ACTION_PACKAGE = "Install/list/delete application packages and list app instances that use this package"; + String DESCRIBE_ACTION_INSTALL_PACKAGE = "Install application package." + + " Deprecated, use '" + ACTION_PACKAGE + " " + ClientArgs.ARG_INSTALL + "'."; + String DESCRIBE_ACTION_PACKAGE = "Install/list/delete application packages and list app instances that use the packages"; String DESCRIBE_ACTION_CLIENT = "Install the application client in the specified directory or obtain a client keystore or truststore"; - String DESCRIBE_ACTION_INSTALL_KEYTAB = "Install the Kerberos keytab file in the sub-folder 'keytabs' of the user's Slider base directory"; + String DESCRIBE_ACTION_INSTALL_KEYTAB = "Install the Kerberos keytab." + + " Deprecated, use '" + ACTION_KEYTAB + " " + ClientArgs.ARG_INSTALL + "'."; String DESCRIBE_ACTION_KEYTAB = "Manage a Kerberos keytab file (install, delete, list) in the sub-folder 'keytabs' of the user's Slider base directory"; String DESCRIBE_ACTION_DIAGNOSTIC = "Diagnose the configuration of the running slider application and slider client"; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/aa273839/slider-core/src/main/java/org/apache/slider/providers/agent/State.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/State.java b/slider-core/src/main/java/org/apache/slider/providers/agent/State.java index 0738740..91aee87 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/State.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/State.java @@ -102,8 +102,6 @@ public enum State { return State.UPGRADED; } else if (this == State.STOPPING) { return State.STOPPED; - } else if (this == State.STOPPED) { - return State.TERMINATING; } else { throw new IllegalArgumentException(result + " is not valid for " + this); }
