HDDS-415. 'ozone om' with incorrect argument first logs all the STARTUP_MSG. Contributed by Namit Maheshwari.

This commit is contained in:
Márton Elek 2018-09-13 13:47:59 +02:00
parent 5d084d7eca
commit e084627150

View File

@ -258,7 +258,6 @@ public static void main(String[] argv) throws IOException {
hParser.printGenericCommandUsage(System.err); hParser.printGenericCommandUsage(System.err);
System.exit(1); System.exit(1);
} }
StringUtils.startupShutdownMessage(OzoneManager.class, argv, LOG);
OzoneManager om = createOm(hParser.getRemainingArgs(), conf); OzoneManager om = createOm(hParser.getRemainingArgs(), conf);
if (om != null) { if (om != null) {
om.start(); om.start();
@ -298,6 +297,7 @@ public static OzoneManager createOm(String[] argv,
} }
switch (startOpt) { switch (startOpt) {
case CREATEOBJECTSTORE: case CREATEOBJECTSTORE:
StringUtils.startupShutdownMessage(OzoneManager.class, argv, LOG);
terminate(omInit(conf) ? 0 : 1); terminate(omInit(conf) ? 0 : 1);
return null; return null;
case HELP: case HELP:
@ -305,6 +305,7 @@ public static OzoneManager createOm(String[] argv,
terminate(0); terminate(0);
return null; return null;
default: default:
StringUtils.startupShutdownMessage(OzoneManager.class, argv, LOG);
return new OzoneManager(conf); return new OzoneManager(conf);
} }
} }