Repository: hadoop Updated Branches: refs/heads/ozone-0.3 308c614d4 -> 056f48009
HDDS-583. SCM returns zero as the return code, even when invalid options are passed. Contributed by Namit Maheshwari. (cherry picked from commit 6a39739316795a4828833e99d78aadc684270f98) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/056f4800 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/056f4800 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/056f4800 Branch: refs/heads/ozone-0.3 Commit: 056f480093938808aa016d828000a1fc99cff141 Parents: 308c614 Author: Bharat Viswanadham <bha...@apache.org> Authored: Tue Oct 9 15:21:02 2018 -0700 Committer: Bharat Viswanadham <bha...@apache.org> Committed: Tue Oct 9 15:21:50 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hdds/scm/server/StorageContainerManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/056f4800/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java index efd5fc5..ce2725f 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java @@ -513,7 +513,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl private static StartupOption parseArguments(String[] args) { int argsLen = (args == null) ? 0 : args.length; - StartupOption startOpt = StartupOption.HELP; + StartupOption startOpt = null; if (argsLen == 0) { startOpt = StartupOption.REGULAR; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
