This is an automated email from the ASF dual-hosted git repository. aengineer pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push: new 0042079 HDDS-1597. Remove hdds-server-scm dependency from ozone-common (#969) 0042079 is described below commit 004207996c6610d67d1a202da5e51d7bc7890484 Author: Elek, Márton <e...@users.noreply.github.com> AuthorDate: Mon Jun 24 20:56:04 2019 +0200 HDDS-1597. Remove hdds-server-scm dependency from ozone-common (#969) * HDDS-1597. Remove hdds-server-scm dependency from ozone-common. Contributed by Elek, Marton. * checkstyle fixes * revert the import reorder of HddsUtil * add javadoc * switch back to the commons-lang2 * fix typo * fix metrics core classpath problem (+rebase fix) --- .../hadoop/hdds/scm/exceptions/SCMException.java | 0 .../hadoop/hdds/scm/exceptions/package-info.java | 0 hadoop-hdds/container-service/pom.xml | 10 ++++------ .../org/apache/hadoop/hdds/server/ServerUtils.java | 21 +++++++++++++++++++++ hadoop-hdds/server-scm/pom.xml | 4 ++++ .../java/org/apache/hadoop/hdds/scm/ScmUtils.java | 21 ++------------------- hadoop-ozone/common/pom.xml | 4 ---- .../main/java/org/apache/hadoop/ozone/OmUtils.java | 4 ++-- hadoop-ozone/integration-test/pom.xml | 9 +++++++++ .../apache/hadoop/ozone/om/TestKeyManagerImpl.java | 0 hadoop-ozone/pom.xml | 5 +++++ hadoop-ozone/tools/pom.xml | 5 +++++ 12 files changed, 52 insertions(+), 31 deletions(-) diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/exceptions/SCMException.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/exceptions/SCMException.java similarity index 100% rename from hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/exceptions/SCMException.java rename to hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/exceptions/SCMException.java diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/exceptions/package-info.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/exceptions/package-info.java similarity index 100% rename from hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/exceptions/package-info.java rename to hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/exceptions/package-info.java diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml index c1dd403..2f89fa2 100644 --- a/hadoop-hdds/container-service/pom.xml +++ b/hadoop-hdds/container-service/pom.xml @@ -37,6 +37,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdds-server-framework</artifactId> </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + </dependency> <dependency> <groupId>org.mockito</groupId> @@ -56,12 +60,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <version>3.0.1</version> <scope>provided</scope> </dependency> - - <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/ServerUtils.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/ServerUtils.java index f775ca1..33a1ca9 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/ServerUtils.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/ServerUtils.java @@ -203,4 +203,25 @@ public final class ServerUtils { conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, path); } + /** + * Returns with the service specific metadata directory. + * <p> + * If the directory is missing the method tries to create it. + * + * @param conf The ozone configuration object + * @param key The configuration key which specify the directory. + * @return The path of the directory. + */ + public static File getDBPath(Configuration conf, String key) { + final File dbDirPath = + getDirectoryFromConfig(conf, key, "OM"); + if (dbDirPath != null) { + return dbDirPath; + } + + LOG.warn("{} is not configured. We recommend adding this setting. " + + "Falling back to {} instead.", key, + HddsConfigKeys.OZONE_METADATA_DIRS); + return ServerUtils.getOzoneMetaDirPath(conf); + } } diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml index 99d5922..60b1b44 100644 --- a/hadoop-hdds/server-scm/pom.xml +++ b/hadoop-hdds/server-scm/pom.xml @@ -101,6 +101,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <artifactId>bcprov-jdk15on</artifactId> </dependency> <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + </dependency> + <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>findbugs</artifactId> <scope>provided</scope> diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ScmUtils.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ScmUtils.java index 3770253..426341a 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ScmUtils.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ScmUtils.java @@ -18,18 +18,13 @@ package org.apache.hadoop.hdds.scm; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ScmOps; -import org.apache.hadoop.hdds.scm.safemode.Precheck; import org.apache.hadoop.hdds.scm.exceptions.SCMException; -import org.apache.hadoop.hdds.server.ServerUtils; +import org.apache.hadoop.hdds.scm.safemode.Precheck; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; - /** * SCM utility class. */ @@ -53,16 +48,4 @@ public final class ScmUtils { } } - public static File getDBPath(Configuration conf, String dbDirectory) { - final File dbDirPath = - ServerUtils.getDirectoryFromConfig(conf, dbDirectory, "OM"); - if (dbDirPath != null) { - return dbDirPath; - } - - LOG.warn("{} is not configured. We recommend adding this setting. " - + "Falling back to {} instead.", dbDirectory, - HddsConfigKeys.OZONE_METADATA_DIRS); - return ServerUtils.getOzoneMetaDirPath(conf); - } } diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 06973b3..050022c 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -62,10 +62,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdds-server-scm</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdds-container-service</artifactId> </dependency> <dependency> diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java index 0778056..3bd884e 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java @@ -42,8 +42,8 @@ import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hdds.scm.ScmUtils; import org.apache.hadoop.hdds.scm.HddsServerUtil; +import org.apache.hadoop.hdds.server.ServerUtils; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.ozone.om.OMConfigKeys; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; @@ -172,7 +172,7 @@ public final class OmUtils { * @return File path, after creating all the required Directories. */ public static File getOmDbDir(Configuration conf) { - return ScmUtils.getDBPath(conf, OMConfigKeys.OZONE_OM_DB_DIRS); + return ServerUtils.getDBPath(conf, OMConfigKeys.OZONE_OM_DB_DIRS); } /** diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml index ff18fd4..fee0c615 100644 --- a/hadoop-ozone/integration-test/pom.xml +++ b/hadoop-ozone/integration-test/pom.xml @@ -36,6 +36,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-server-scm</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-ozone-ozone-manager</artifactId> </dependency> <dependency> @@ -65,6 +69,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <artifactId>hadoop-ozone-client</artifactId> </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-ozone-ozone-manager</artifactId> <scope>test</scope> diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java similarity index 100% rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index 4a6df28..9fa1c8b 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -220,6 +220,11 @@ <artifactId>bcprov-jdk15on</artifactId> <version>${bouncycastle.version}</version> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> </dependencies> </dependencyManagement> <dependencies> diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index f8ed807..7ce6f6b 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -37,6 +37,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-ozone-common</artifactId> </dependency> + <!-- Genesis requires server side components --> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-server-scm</artifactId> + </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-ozone-client</artifactId> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org