From 530029809e9a688c8ea7c581a7d8154c629f04c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Elek?= <elek@apache.org>
Date: Thu, 13 Sep 2018 13:47:59 +0200
Subject: [PATCH] HDDS-415. 'ozone om' with incorrect argument first logs all
 the STARTUP_MSG. Contributed by Namit Maheshwari.

---
 .../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 348d0c0390d..b5bd3615078 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -258,7 +258,6 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
         hParser.printGenericCommandUsage(System.err);
         System.exit(1);
       }
-      StringUtils.startupShutdownMessage(OzoneManager.class, argv, LOG);
       OzoneManager om = createOm(hParser.getRemainingArgs(), conf);
       if (om != null) {
         om.start();
@@ -298,6 +297,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
     }
     switch (startOpt) {
     case CREATEOBJECTSTORE:
+      StringUtils.startupShutdownMessage(OzoneManager.class, argv, LOG);
       terminate(omInit(conf) ? 0 : 1);
       return null;
     case HELP:
@@ -305,6 +305,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
       terminate(0);
       return null;
     default:
+      StringUtils.startupShutdownMessage(OzoneManager.class, argv, LOG);
       return new OzoneManager(conf);
     }
   }