diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/StringUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/StringUtils.java index cb10dab51d5c..e7746d9d5cad 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/StringUtils.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/StringUtils.java @@ -20,9 +20,19 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Map; import com.google.common.base.Preconditions; +import org.apache.commons.lang3.SystemUtils; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.utils.SignalLogger; +import org.apache.hadoop.hdds.utils.VersionInfo; +import org.apache.hadoop.net.NetUtils; +import org.apache.hadoop.util.ShutdownHookManager; import org.apache.ratis.thirdparty.io.netty.buffer.Unpooled; +import org.slf4j.Logger; /** * Simple utility class to collection string conversion methods. @@ -34,6 +44,11 @@ private StringUtils() { private static final Charset UTF8 = StandardCharsets.UTF_8; + /** + * Priority of the StringUtils shutdown hook. + */ + private static final int SHUTDOWN_HOOK_PRIORITY = 0; + /** * Decode a specific range of bytes of the given byte array to a string * using UTF8. @@ -92,6 +107,70 @@ public static byte[] string2Bytes(String str) { return str.getBytes(UTF8); } + /** + * Return a message for logging. + * @param prefix prefix keyword for the message + * @param msg content of the message + * @return a message for logging + */ + public static String toStartupShutdownString(String prefix, String... msg) { + StringBuilder b = new StringBuilder(prefix); + b.append("\n/************************************************************"); + for (String s : msg) { + b.append("\n").append(prefix).append(s); + } + b.append("\n************************************************************/"); + return b.toString(); + } + + public static void startupShutdownMessage(VersionInfo versionInfo, + Class clazz, String[] args, Logger log, OzoneConfiguration conf) { + final String hostname = NetUtils.getHostname(); + final String className = clazz.getSimpleName(); + + if (log.isInfoEnabled()) { + log.info(createStartupShutdownMessage(versionInfo, className, hostname, + args, HddsUtils.processForLogging(conf))); + } + + if (SystemUtils.IS_OS_UNIX) { + try { + SignalLogger.INSTANCE.register(log); + } catch (Throwable t) { + log.warn("failed to register any UNIX signal loggers: ", t); + } + } + ShutdownHookManager.get().addShutdownHook( + () -> log.info(toStartupShutdownString("SHUTDOWN_MSG: ", + "Shutting down " + className + " at " + hostname)), + SHUTDOWN_HOOK_PRIORITY); + + } + + /** + * Generate the text for the startup/shutdown message of processes. + * @param className short name of the class + * @param hostname hostname + * @param args Command arguments + * @return a string to log. + */ + public static String createStartupShutdownMessage(VersionInfo versionInfo, + String className, String hostname, String[] args, + Map conf) { + return toStartupShutdownString("STARTUP_MSG: ", + "Starting " + className, + " host = " + hostname, + " args = " + (args != null ? Arrays.asList(args) : new ArrayList<>()), + " version = " + versionInfo.getVersion(), + " classpath = " + System.getProperty("java.class.path"), + " build = " + versionInfo.getUrl() + "/" + + versionInfo.getRevision() + + " ; compiled by '" + versionInfo.getUser() + + "' on " + versionInfo.getDate(), + " java = " + System.getProperty("java.version"), + " conf = " + conf); + } + public static String appendIfNotPresent(String str, char c) { Preconditions.checkNotNull(str, "Input string is null"); return str.isEmpty() || str.charAt(str.length() - 1) != c ? str + c : str; diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/SignalLogger.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/SignalLogger.java similarity index 74% rename from hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/SignalLogger.java rename to hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/SignalLogger.java index df6f18cf6ee3..5782f806d54c 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/SignalLogger.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/SignalLogger.java @@ -18,18 +18,10 @@ package org.apache.hadoop.hdds.utils; -import jnr.constants.platform.Signal; -import jnr.posix.POSIX; -import jnr.posix.POSIXFactory; -import jnr.posix.SignalHandler; -import jnr.posix.util.DefaultPOSIXHandler; import org.apache.hadoop.hdds.annotation.InterfaceAudience; import org.apache.hadoop.hdds.annotation.InterfaceStability; import org.slf4j.Logger; -import java.util.EnumSet; -import java.util.Set; - /** * This class logs a message whenever we're about to exit on a UNIX signal. * This is helpful for determining the root cause of a process' exit. @@ -42,18 +34,20 @@ public enum SignalLogger { INSTANCE; - private static final Set SIGNALS = EnumSet.of(Signal.SIGHUP, Signal.SIGINT, Signal.SIGTERM); + private static final String[] SIGNALS = new String[] {"TERM", "HUP", "INT"}; private boolean registered = false; /** * Our signal handler. */ - private static class Handler implements SignalHandler { + private static class Handler implements sun.misc.SignalHandler { private final Logger log; + private final sun.misc.SignalHandler prevHandler; - Handler(Logger log) { + Handler(String name, Logger log) { this.log = log; + prevHandler = sun.misc.Signal.handle(new sun.misc.Signal(name), this); } /** @@ -62,8 +56,10 @@ private static class Handler implements SignalHandler { * @param signal The incoming signal */ @Override - public void handle(int signal) { - log.error("RECEIVED SIGNAL {}: {}", signal, Signal.valueOf(signal)); + public void handle(sun.misc.Signal signal) { + log.error("RECEIVED SIGNAL {}: SIG{}", + signal.getNumber(), signal.getName()); + prevHandler.handle(signal); } } @@ -80,12 +76,10 @@ public void register(final Logger log) { StringBuilder bld = new StringBuilder(); bld.append("registered UNIX signal handlers for ["); String separator = ""; - final POSIX posix = POSIXFactory.getPOSIX(new DefaultPOSIXHandler(), true); - final Handler handler = new Handler(log); - for (Signal signal : SIGNALS) { + for (String signalName : SIGNALS) { try { - posix.signal(signal, handler); - bld.append(separator).append(signal.name()); + new Handler(signalName, log); + bld.append(separator).append(signalName); separator = ", "; } catch (Exception e) { log.debug("", e); diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java index 02c6160545d9..55125e5fb37b 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java @@ -33,6 +33,7 @@ import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.DatanodeVersion; import org.apache.hadoop.hdds.HddsUtils; +import org.apache.hadoop.hdds.StringUtils; import org.apache.hadoop.hdds.cli.GenericCli; import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.hdds.conf.OzoneConfiguration; @@ -171,7 +172,7 @@ public static Logger getLogger() { public Void call() throws Exception { OzoneConfiguration configuration = createOzoneConfiguration(); if (printBanner) { - HddsServerUtil.startupShutdownMessage(HddsVersionInfo.HDDS_VERSION_INFO, + StringUtils.startupShutdownMessage(HddsVersionInfo.HDDS_VERSION_INFO, HddsDatanodeService.class, args, LOG, configuration); } start(configuration); diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index 5eb3d2071b70..ef988bbc494b 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -144,10 +144,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> com.fasterxml.jackson.datatype jackson-datatype-jsr310 - - com.github.jnr - jnr-posix - org.apache.hadoop hadoop-hdfs-client diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java index c45e772c2417..2b83c4d05941 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java @@ -25,10 +25,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.OptionalInt; import java.util.concurrent.TimeUnit; @@ -41,10 +39,8 @@ import org.apache.commons.compress.archivers.ArchiveOutputStream; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; import org.apache.commons.compress.utils.IOUtils; -import org.apache.commons.lang3.SystemUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdds.DFSConfigKeysLegacy; -import org.apache.hadoop.hdds.HddsUtils; import org.apache.hadoop.hdds.conf.ConfigurationSource; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.SCMSecurityProtocol; @@ -103,7 +99,6 @@ import static org.apache.hadoop.hdds.server.ServerUtils.sanitizeUserArgs; import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_CONTAINER_DB_DIR; -import org.apache.hadoop.util.ShutdownHookManager; import org.rocksdb.RocksDBException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -116,8 +111,6 @@ public final class HddsServerUtil { private HddsServerUtil() { } - private static final int SHUTDOWN_HOOK_PRIORITY = 0; - public static final String OZONE_RATIS_SNAPSHOT_COMPLETE_FLAG_NAME = "OZONE_RATIS_SNAPSHOT_COMPLETE"; @@ -685,68 +678,4 @@ public static IOException toIOException(String msg, RocksDBException e) { public static void addSuppressedLoggingExceptions(RPC.Server server) { server.addSuppressedLoggingExceptions(ServerNotLeaderException.class); } - - public static void startupShutdownMessage(VersionInfo versionInfo, - Class clazz, String[] args, Logger log, OzoneConfiguration conf) { - final String hostname = NetUtils.getHostname(); - final String className = clazz.getSimpleName(); - - if (log.isInfoEnabled()) { - log.info(createStartupShutdownMessage(versionInfo, className, hostname, - args, HddsUtils.processForLogging(conf))); - } - - if (SystemUtils.IS_OS_UNIX) { - try { - SignalLogger.INSTANCE.register(log); - } catch (Throwable t) { - log.warn("failed to register any UNIX signal loggers: ", t); - } - } - ShutdownHookManager.get().addShutdownHook( - () -> log.info(toStartupShutdownString("SHUTDOWN_MSG: ", - "Shutting down " + className + " at " + hostname)), - SHUTDOWN_HOOK_PRIORITY); - } - - /** - * Return a message for logging. - * @param prefix prefix keyword for the message - * @param msg content of the message - * @return a message for logging - */ - public static String toStartupShutdownString(String prefix, String... msg) { - StringBuilder b = new StringBuilder(prefix); - b.append("\n/************************************************************"); - for (String s : msg) { - b.append("\n").append(prefix).append(s); - } - b.append("\n************************************************************/"); - return b.toString(); - } - - /** - * Generate the text for the startup/shutdown message of processes. - * @param className short name of the class - * @param hostname hostname - * @param args Command arguments - * @return a string to log. - */ - public static String createStartupShutdownMessage(VersionInfo versionInfo, - String className, String hostname, String[] args, - Map conf) { - return toStartupShutdownString("STARTUP_MSG: ", - "Starting " + className, - " host = " + hostname, - " args = " + (args != null ? Arrays.asList(args) : new ArrayList<>()), - " version = " + versionInfo.getVersion(), - " classpath = " + System.getProperty("java.class.path"), - " build = " + versionInfo.getUrl() + "/" - + versionInfo.getRevision() - + " ; compiled by '" + versionInfo.getUser() - + "' on " + versionInfo.getDate(), - " java = " + System.getProperty("java.version"), - " conf = " + conf); - } - } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManagerStarter.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManagerStarter.java index e258c8ee66e6..916578796ff2 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManagerStarter.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManagerStarter.java @@ -21,11 +21,11 @@ */ package org.apache.hadoop.hdds.scm.server; +import org.apache.hadoop.hdds.StringUtils; import org.apache.hadoop.hdds.cli.GenericCli; import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.tracing.TracingUtil; -import org.apache.hadoop.hdds.utils.HddsServerUtil; import org.apache.hadoop.hdds.utils.HddsVersionInfo; import org.apache.hadoop.ozone.common.StorageInfo; import org.apache.hadoop.ozone.util.OzoneNetUtils; @@ -155,7 +155,7 @@ private void commonInit() { String[] originalArgs = getCmd().getParseResult().originalArgs() .toArray(new String[0]); - HddsServerUtil.startupShutdownMessage(HddsVersionInfo.HDDS_VERSION_INFO, + StringUtils.startupShutdownMessage(HddsVersionInfo.HDDS_VERSION_INFO, StorageContainerManager.class, originalArgs, LOG, conf); } diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml index 04c153f3988c..dc6ca506ff30 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -66,10 +66,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - org.apache.ozone - hdds-server-framework - com.google.code.findbugs jsr305 diff --git a/hadoop-ozone/csi/src/main/java/org/apache/hadoop/ozone/csi/CsiServer.java b/hadoop-ozone/csi/src/main/java/org/apache/hadoop/ozone/csi/CsiServer.java index dbafccf4fd20..3b0c8f3c20fd 100644 --- a/hadoop-ozone/csi/src/main/java/org/apache/hadoop/ozone/csi/CsiServer.java +++ b/hadoop-ozone/csi/src/main/java/org/apache/hadoop/ozone/csi/CsiServer.java @@ -19,13 +19,13 @@ import java.util.concurrent.Callable; +import org.apache.hadoop.hdds.StringUtils; import org.apache.hadoop.hdds.cli.GenericCli; import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.hdds.conf.Config; import org.apache.hadoop.hdds.conf.ConfigGroup; import org.apache.hadoop.hdds.conf.ConfigTag; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.hdds.utils.HddsServerUtil; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientFactory; import org.apache.hadoop.ozone.util.OzoneVersionInfo; @@ -55,7 +55,7 @@ public Void call() throws Exception { String[] originalArgs = getCmd().getParseResult().originalArgs() .toArray(new String[0]); OzoneConfiguration ozoneConfiguration = createOzoneConfiguration(); - HddsServerUtil.startupShutdownMessage(OzoneVersionInfo.OZONE_VERSION_INFO, + StringUtils.startupShutdownMessage(OzoneVersionInfo.OZONE_VERSION_INFO, CsiServer.class, originalArgs, LOG, ozoneConfiguration); CsiConfig csiConfig = ozoneConfiguration.getObject(CsiConfig.class); diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index c28483c67356..2120c16e240b 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -218,7 +218,6 @@ EDL 1.0 EPL 2.0 ===================== - com.github.jnr:jnr-posix jakarta.annotation:jakarta.annotation-api jakarta.ws.rs:jakarta.ws.rs-api org.aspectj:aspectjrt @@ -278,10 +277,6 @@ Apache License 2.0 com.fasterxml.jackson.datatype:jackson-datatype-jsr310 com.fasterxml.jackson.module:jackson-module-jaxb-annotations com.fasterxml.woodstox:woodstox-core - com.github.jnr:jnr-a64asm - com.github.jnr:jnr-constants - com.github.jnr:jnr-ffi - com.github.jnr:jffi com.github.stephenc.jcip:jcip-annotations com.google.android:annotations com.google.api.grpc:proto-google-common-protos @@ -448,7 +443,6 @@ MIT ===================== com.bettercloud:vault-java-driver - com.github.jnr:jnr-x86asm com.kstruct:gethostname4j org.bouncycastle:bcpkix-jdk18on org.bouncycastle:bcprov-jdk18on @@ -475,11 +469,6 @@ BSD 3-Clause com.google.re2j:re2j com.jcraft:jsch com.thoughtworks.paranamer:paranamer - org.ow2.asm:asm - org.ow2.asm:asm-analysis - org.ow2.asm:asm-commons - org.ow2.asm:asm-tree - org.ow2.asm:asm-util BSD 2-Clause diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt index 042c9380e4af..28f38213cd1e 100644 --- a/hadoop-ozone/dist/src/main/license/jar-report.txt +++ b/hadoop-ozone/dist/src/main/license/jar-report.txt @@ -3,11 +3,6 @@ share/ozone/lib/annotations.jar share/ozone/lib/annotations.jar share/ozone/lib/aopalliance.jar share/ozone/lib/aopalliance-repackaged.jar -share/ozone/lib/asm-analysis.jar -share/ozone/lib/asm-commons.jar -share/ozone/lib/asm.jar -share/ozone/lib/asm-tree.jar -share/ozone/lib/asm-util.jar share/ozone/lib/aspectjrt.jar share/ozone/lib/aspectjweaver.jar share/ozone/lib/aws-java-sdk-core.jar @@ -144,8 +139,6 @@ share/ozone/lib/jetty-util-ajax.jar share/ozone/lib/jetty-util.jar share/ozone/lib/jetty-webapp.jar share/ozone/lib/jetty-xml.jar -share/ozone/lib/jffi.jar -share/ozone/lib/jffi-native.jar share/ozone/lib/jgrapht-core.jar share/ozone/lib/jgrapht-ext.jar share/ozone/lib/jgraphx.jar @@ -153,11 +146,6 @@ share/ozone/lib/jheaps.jar share/ozone/lib/jmespath-java.jar share/ozone/lib/jna.jar share/ozone/lib/jna-platform.jar -share/ozone/lib/jnr-a64asm.jar -share/ozone/lib/jnr-constants.jar -share/ozone/lib/jnr-ffi.jar -share/ozone/lib/jnr-posix.jar -share/ozone/lib/jnr-x86asm.jar share/ozone/lib/joda-time.jar share/ozone/lib/jooq-codegen.jar share/ozone/lib/jooq.jar diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java index 63617ee36374..b3078739119c 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java @@ -17,11 +17,11 @@ package org.apache.hadoop.ozone.om; +import org.apache.hadoop.hdds.StringUtils; import org.apache.hadoop.hdds.cli.GenericCli; import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.tracing.TracingUtil; -import org.apache.hadoop.hdds.utils.HddsServerUtil; import org.apache.hadoop.ozone.util.OzoneNetUtils; import org.apache.hadoop.ozone.util.OzoneVersionInfo; import org.apache.hadoop.ozone.util.ShutdownHookManager; @@ -172,7 +172,7 @@ private void commonInit() { String[] originalArgs = getCmd().getParseResult().originalArgs() .toArray(new String[0]); - HddsServerUtil.startupShutdownMessage(OzoneVersionInfo.OZONE_VERSION_INFO, + StringUtils.startupShutdownMessage(OzoneVersionInfo.OZONE_VERSION_INFO, OzoneManager.class, originalArgs, LOG, conf); } diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconServer.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconServer.java index 3295eb4524c7..a079bfe508ef 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconServer.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconServer.java @@ -22,6 +22,7 @@ import com.google.inject.Guice; import com.google.inject.Injector; import org.apache.hadoop.hdds.HddsUtils; +import org.apache.hadoop.hdds.StringUtils; import org.apache.hadoop.hdds.cli.GenericCli; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocolPB.SCMSecurityProtocolClientSideTranslatorPB; @@ -101,7 +102,7 @@ public Void call() throws Exception { .toArray(new String[0]); configuration = createOzoneConfiguration(); - HddsServerUtil.startupShutdownMessage(OzoneVersionInfo.OZONE_VERSION_INFO, + StringUtils.startupShutdownMessage(OzoneVersionInfo.OZONE_VERSION_INFO, ReconServer.class, originalArgs, LOG, configuration); ConfigurationProvider.setConfiguration(configuration); diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/Gateway.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/Gateway.java index 86d25d194173..cfbcb51d266e 100644 --- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/Gateway.java +++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/Gateway.java @@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory; import picocli.CommandLine.Command; +import static org.apache.hadoop.hdds.StringUtils.startupShutdownMessage; import static org.apache.hadoop.hdds.ratis.RatisHelper.newJvmPauseMonitor; import static org.apache.hadoop.hdds.server.http.HttpServer2.setHttpBaseDir; import static org.apache.hadoop.ozone.conf.OzoneServiceConfig.DEFAULT_SHUTDOWN_HOOK_PRIORITY; @@ -94,7 +95,7 @@ public Void call() throws Exception { public void start() throws IOException { String[] originalArgs = getCmd().getParseResult().originalArgs() .toArray(new String[0]); - HddsServerUtil.startupShutdownMessage(OzoneVersionInfo.OZONE_VERSION_INFO, + startupShutdownMessage(OzoneVersionInfo.OZONE_VERSION_INFO, Gateway.class, originalArgs, LOG, ozoneConfiguration); LOG.info("Starting Ozone S3 gateway"); diff --git a/pom.xml b/pom.xml index 50239b734c6b..205f5591fa69 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 1.2.2 2.3.3 2.3.9 - 3.1.19 0.1.55 2.0 3.1.0 @@ -230,7 +229,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 3.1.9.Final - 8 + 1.8 - - java8 - - [,8] - - - ${javac.version} - ${javac.version} - - - - java9-or-later - - [9,] - - - ${javac.version} - - - go-offline