Repository: hadoop Updated Branches: refs/heads/ozone-0.2 3ade889e5 -> 5d47072b4
HDDS-452. 'ozone scm' with incorrect argument first logs all the STARTUP_MSG. Contributed by Namit Maheshwari. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5d47072b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5d47072b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5d47072b Branch: refs/heads/ozone-0.2 Commit: 5d47072b43c364dbd90f57ab10223cb87673909f Parents: 3ade889 Author: Jitendra Pandey <jiten...@apache.org> Authored: Fri Sep 14 11:38:50 2018 -0700 Committer: Jitendra Pandey <jiten...@apache.org> Committed: Fri Sep 14 11:58:38 2018 -0700 ---------------------------------------------------------------------- .../hadoop/hdds/scm/server/StorageContainerManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d47072b/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 28a4983..b3408a4 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 @@ -361,8 +361,6 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl hParser.printGenericCommandUsage(System.err); System.exit(1); } - StringUtils.startupShutdownMessage(StorageContainerManager.class, argv, - LOG); StorageContainerManager scm = createSCM(hParser.getRemainingArgs(), conf); if (scm != null) { scm.start(); @@ -395,9 +393,13 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl } switch (startOpt) { case INIT: + StringUtils.startupShutdownMessage(StorageContainerManager.class, argv, + LOG); terminate(scmInit(conf) ? 0 : 1); return null; case GENCLUSTERID: + StringUtils.startupShutdownMessage(StorageContainerManager.class, argv, + LOG); System.out.println("Generating new cluster id:"); System.out.println(StorageInfo.newClusterID()); terminate(0); @@ -407,6 +409,8 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl terminate(0); return null; default: + StringUtils.startupShutdownMessage(StorageContainerManager.class, argv, + LOG); return new StorageContainerManager(conf); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
