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 62b02e03c8
commit 530029809e
1 changed files with 2 additions and 1 deletions

View File

@ -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);
}
}