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 el...@apache.org on 2019/06/03 06:37:42 UTC
[hadoop] branch trunk updated: Revert "HDDS-1597. Remove
hdds-server-scm dependency from ozone-common. (#860)"
This is an automated email from the ASF dual-hosted git repository.
elek 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 2a97a37 Revert "HDDS-1597. Remove hdds-server-scm dependency from ozone-common. (#860)"
2a97a37 is described below
commit 2a97a37d9e313e509ac43fdafd379183fd564d9a
Author: Márton Elek <el...@apache.org>
AuthorDate: Mon Jun 3 08:34:19 2019 +0200
Revert "HDDS-1597. Remove hdds-server-scm dependency from ozone-common. (#860)"
This reverts commit baee71551d5a9c39760631de463684d810fa96fa.
---
.../org/apache/hadoop/hdds/server/ServerUtils.java | 21 ---------------------
.../java/org/apache/hadoop/hdds/scm/ScmUtils.java | 21 +++++++++++++++++++--
.../hadoop/hdds/scm/exceptions/SCMException.java | 0
.../hadoop/hdds/scm/exceptions/package-info.java | 0
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 -----
10 files changed, 25 insertions(+), 44 deletions(-)
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 33a1ca9..f775ca1 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,25 +203,4 @@ 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/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 426341a..3770253 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,13 +18,18 @@
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.exceptions.SCMException;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+
/**
* SCM utility class.
*/
@@ -48,4 +53,16 @@ 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-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/exceptions/SCMException.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/exceptions/SCMException.java
similarity index 100%
rename from hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/exceptions/SCMException.java
rename to hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/exceptions/SCMException.java
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/exceptions/package-info.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/exceptions/package-info.java
similarity index 100%
rename from hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/exceptions/package-info.java
rename to hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/exceptions/package-info.java
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index 050022c..06973b3 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -62,6 +62,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-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 f4c33d3..5cd5142 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
@@ -39,7 +39,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdds.server.ServerUtils;
+import org.apache.hadoop.hdds.scm.ScmUtils;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
@@ -164,7 +164,7 @@ public final class OmUtils {
* @return File path, after creating all the required Directories.
*/
public static File getOmDbDir(Configuration conf) {
- return ServerUtils.getDBPath(conf, OMConfigKeys.OZONE_OM_DB_DIRS);
+ return ScmUtils.getDBPath(conf, OMConfigKeys.OZONE_OM_DB_DIRS);
}
/**
diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml
index 2ecee8c..3d4de8e 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -36,10 +36,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-ozone-ozone-manager</artifactId>
</dependency>
<dependency>
@@ -69,11 +65,6 @@ 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/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
similarity index 100%
rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 408c640..a754d1f 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -220,11 +220,6 @@
<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 7ce6f6b..f8ed807 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -37,11 +37,6 @@ 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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org