HDDS-5057. Remove backward direction dependency between HDDS->Ozone (#2106)
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/ExitManager.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/ExitManager.java
similarity index 96%
rename from hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/ExitManager.java
rename to hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/ExitManager.java
index 46a4fd7..e48c149 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/ExitManager.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/ExitManager.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.ozone.util;
+package org.apache.hadoop.hdds;
import org.apache.ratis.util.ExitUtils;
import org.slf4j.Logger;
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/ha/NodeDetails.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/NodeDetails.java
similarity index 98%
rename from hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/ha/NodeDetails.java
rename to hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/NodeDetails.java
index c73abb9..baa4b49 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/ha/NodeDetails.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/NodeDetails.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.hadoop.ozone.ha;
+package org.apache.hadoop.hdds;
import org.apache.hadoop.net.NetUtils;
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/ExitManager.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/package-info.java
similarity index 65%
copy from hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/ExitManager.java
copy to hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/package-info.java
index 46a4fd7..abb527e 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/ExitManager.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/package-info.java
@@ -14,20 +14,11 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+ * <p>
+ * Freon related helper classes used for load testing.
*/
-package org.apache.hadoop.ozone.util;
-
-import org.apache.ratis.util.ExitUtils;
-import org.slf4j.Logger;
/**
- * An Exit Manager used to shutdown service in case of unrecoverable error.
- * This class will be helpful to test exit functionality.
+ * Generic HDDS related utilities and helper classes.
*/
-public class ExitManager {
-
- public void exitSystem(int status, String message, Throwable throwable,
- Logger log) {
- ExitUtils.terminate(status, message, throwable, log);
- }
-}
+package org.apache.hadoop.hdds;
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index ad0c445..3a81a95 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -126,12 +126,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-ozone-common</artifactId>
- <version>${hdds.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-server-scm</artifactId>
<version>${hdds.version}</version>
</dependency>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index 9aeb67c..df1148c 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -50,10 +50,6 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-ozone-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-hadoop-dependency-server</artifactId>
</dependency>
<dependency>
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java
index 0702a92..dca469a 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java
@@ -33,7 +33,7 @@
import org.apache.hadoop.hdds.utils.db.DBCheckpoint;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.OzoneSecurityUtil;
-import org.apache.hadoop.ozone.util.ExitManager;
+import org.apache.hadoop.hdds.ExitManager;
import org.apache.ratis.server.protocol.TermIndex;
import org.apache.ratis.util.FileUtils;
import org.slf4j.Logger;
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHANodeDetails.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHANodeDetails.java
index b4d83e0..55f7d11 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHANodeDetails.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHANodeDetails.java
@@ -23,7 +23,6 @@
import org.apache.hadoop.hdds.scm.ScmUtils;
import org.apache.hadoop.hdds.utils.HddsServerUtil;
import org.apache.hadoop.net.NetUtils;
-import org.apache.hadoop.ozone.OzoneIllegalArgumentException;
import org.apache.hadoop.ozone.ha.ConfUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -305,6 +304,6 @@
throws IllegalArgumentException {
String exceptionMsg = String.format(message, arguments);
LOG.error(exceptionMsg);
- throw new OzoneIllegalArgumentException(exceptionMsg);
+ throw new IllegalArgumentException(exceptionMsg);
}
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeDetails.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeDetails.java
index 3f56e6a..47b0a23 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeDetails.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeDetails.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.hdds.scm.ha;
import org.apache.hadoop.net.NetUtils;
-import org.apache.hadoop.ozone.ha.NodeDetails;
+import org.apache.hadoop.hdds.NodeDetails;
import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.protocol.RaftPeerId;
import org.slf4j.Logger;
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
index e296cf5..cc3fda0 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
@@ -36,7 +36,7 @@
import org.apache.hadoop.hdds.utils.TransactionInfo;
import org.apache.hadoop.ozone.om.ratis.OzoneManagerRatisServer;
import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
-import org.apache.hadoop.ozone.util.ExitManager;
+import org.apache.hadoop.hdds.ExitManager;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.ratis.server.protocol.TermIndex;
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMInstallSnapshotWithHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMInstallSnapshotWithHA.java
index 0659091..e251324 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMInstallSnapshotWithHA.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMInstallSnapshotWithHA.java
@@ -39,7 +39,7 @@
import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.hdds.utils.TransactionInfo;
-import org.apache.hadoop.ozone.util.ExitManager;
+import org.apache.hadoop.hdds.ExitManager;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.ratis.server.protocol.TermIndex;
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 74d0fbd..f9485a7 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
@@ -159,7 +159,7 @@
import org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType;
import org.apache.hadoop.ozone.security.acl.OzoneObjInfo;
import org.apache.hadoop.ozone.security.acl.RequestContext;
-import org.apache.hadoop.ozone.util.ExitManager;
+import org.apache.hadoop.hdds.ExitManager;
import org.apache.hadoop.ozone.util.OzoneVersionInfo;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ha/OMNodeDetails.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ha/OMNodeDetails.java
index 29ddef0..7156381 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ha/OMNodeDetails.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ha/OMNodeDetails.java
@@ -20,7 +20,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.hdds.server.http.HttpConfig;
-import org.apache.hadoop.ozone.ha.NodeDetails;
+import org.apache.hadoop.hdds.NodeDetails;
import java.net.InetSocketAddress;
