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 xy...@apache.org on 2018/09/20 22:21:41 UTC
[19/50] [abbrv] hadoop git commit: HDDS-502. Exception in OM startup
when running unit tests. Contributed by Arpit Agarwal.
HDDS-502. Exception in OM startup when running unit tests. Contributed by Arpit Agarwal.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/15ed74fa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/15ed74fa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/15ed74fa
Branch: refs/heads/HDDS-4
Commit: 15ed74fa244eacbe7a8eac877ea64d7a53a1bf9c
Parents: c0956ee
Author: Nanda kumar <na...@apache.org>
Authored: Wed Sep 19 19:46:25 2018 +0530
Committer: Nanda kumar <na...@apache.org>
Committed: Wed Sep 19 19:46:25 2018 +0530
----------------------------------------------------------------------
.../scm/server/StorageContainerManager.java | 55 ++++++++++++++++----
.../apache/hadoop/ozone/om/OzoneManager.java | 33 ++++++++++--
2 files changed, 73 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/15ed74fa/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 2169149..86c061b 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
@@ -374,7 +374,8 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
hParser.printGenericCommandUsage(System.err);
System.exit(1);
}
- StorageContainerManager scm = createSCM(hParser.getRemainingArgs(), conf);
+ StorageContainerManager scm = createSCM(
+ hParser.getRemainingArgs(), conf, true);
if (scm != null) {
scm.start();
scm.join();
@@ -389,9 +390,37 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
out.println(USAGE + "\n");
}
- public static StorageContainerManager createSCM(String[] args,
- OzoneConfiguration conf)
- throws IOException {
+ /**
+ * Create an SCM instance based on the supplied command-line arguments.
+ *
+ * This method is intended for unit tests only. It suppresses the
+ * startup/shutdown message and skips registering Unix signal
+ * handlers.
+ *
+ * @param args command line arguments.
+ * @param conf HDDS configuration
+ * @return SCM instance
+ * @throws IOException
+ */
+ @VisibleForTesting
+ public static StorageContainerManager createSCM(
+ String[] args, OzoneConfiguration conf) throws IOException {
+ return createSCM(args, conf, false);
+ }
+
+ /**
+ * Create an SCM instance based on the supplied command-line arguments.
+ *
+ * @param args command-line arguments.
+ * @param conf HDDS configuration
+ * @param printBanner if true, then log a verbose startup message.
+ * @return SCM instance
+ * @throws IOException
+ */
+ private static StorageContainerManager createSCM(
+ String[] args,
+ OzoneConfiguration conf,
+ boolean printBanner) throws IOException {
String[] argv = (args == null) ? new String[0] : args;
if (!HddsUtils.isHddsEnabled(conf)) {
System.err.println(
@@ -407,13 +436,17 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
}
switch (startOpt) {
case INIT:
- StringUtils.startupShutdownMessage(StorageContainerManager.class, argv,
- LOG);
+ if (printBanner) {
+ StringUtils.startupShutdownMessage(StorageContainerManager.class, argv,
+ LOG);
+ }
terminate(scmInit(conf) ? 0 : 1);
return null;
case GENCLUSTERID:
- StringUtils.startupShutdownMessage(StorageContainerManager.class, argv,
- LOG);
+ if (printBanner) {
+ StringUtils.startupShutdownMessage(StorageContainerManager.class, argv,
+ LOG);
+ }
System.out.println("Generating new cluster id:");
System.out.println(StorageInfo.newClusterID());
terminate(0);
@@ -423,8 +456,10 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
terminate(0);
return null;
default:
- StringUtils.startupShutdownMessage(StorageContainerManager.class, argv,
- LOG);
+ if (printBanner) {
+ StringUtils.startupShutdownMessage(StorageContainerManager.class, argv,
+ LOG);
+ }
return new StorageContainerManager(conf);
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/15ed74fa/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
----------------------------------------------------------------------
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 71cc6ba..6ea0fe7 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,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
hParser.printGenericCommandUsage(System.err);
System.exit(1);
}
- OzoneManager om = createOm(hParser.getRemainingArgs(), conf);
+ OzoneManager om = createOm(hParser.getRemainingArgs(), conf, true);
if (om != null) {
om.start();
om.join();
@@ -276,14 +276,33 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
/**
* Constructs OM instance based on command line arguments.
*
+ * This method is intended for unit tests only. It suppresses the
+ * startup/shutdown message and skips registering Unix signal
+ * handlers.
+ *
* @param argv Command line arguments
* @param conf OzoneConfiguration
* @return OM instance
* @throws IOException in case OM instance creation fails.
*/
+ @VisibleForTesting
+ public static OzoneManager createOm(
+ String[] argv, OzoneConfiguration conf) throws IOException {
+ return createOm(argv, conf, false);
+ }
- public static OzoneManager createOm(String[] argv,
- OzoneConfiguration conf) throws IOException {
+
+ /**
+ * Constructs OM instance based on command line arguments.
+ *
+ * @param argv Command line arguments
+ * @param conf OzoneConfiguration
+ * @param printBanner if true then log a verbose startup message.
+ * @return OM instance
+ * @throws IOException in case OM instance creation fails.
+ */
+ private static OzoneManager createOm(String[] argv,
+ OzoneConfiguration conf, boolean printBanner) throws IOException {
if (!isHddsEnabled(conf)) {
System.err.println("OM cannot be started in secure mode or when " +
OZONE_ENABLED + " is set to false");
@@ -297,7 +316,9 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
}
switch (startOpt) {
case CREATEOBJECTSTORE:
- StringUtils.startupShutdownMessage(OzoneManager.class, argv, LOG);
+ if (printBanner) {
+ StringUtils.startupShutdownMessage(OzoneManager.class, argv, LOG);
+ }
terminate(omInit(conf) ? 0 : 1);
return null;
case HELP:
@@ -308,7 +329,9 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
if (argv == null) {
argv = new String[]{};
}
- StringUtils.startupShutdownMessage(OzoneManager.class, argv, LOG);
+ if (printBanner) {
+ StringUtils.startupShutdownMessage(OzoneManager.class, argv, LOG);
+ }
return new OzoneManager(conf);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org