You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2018/09/18 02:05:56 UTC
[20/50] [abbrv] hadoop git commit: HDDS-452. 'ozone scm' with
incorrect argument first logs all the STARTUP_MSG. Contributed by Namit
Maheshwari.
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/446cb830
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/446cb830
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/446cb830
Branch: refs/heads/HDFS-12943
Commit: 446cb8301ebd651879dfd403d5fa342b4dfaf6e3
Parents: 0c8a43b
Author: Jitendra Pandey <ji...@apache.org>
Authored: Fri Sep 14 11:38:50 2018 -0700
Committer: Jitendra Pandey <ji...@apache.org>
Committed: Fri Sep 14 11:39:36 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/446cb830/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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org