This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 9aae0542c13 HDDS-14708. Move server code out of ozone-common (#9821)
9aae0542c13 is described below
commit 9aae0542c13810644aef4a56ec8bfb0b2b746b10
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Sat Mar 7 16:27:34 2026 +0100
HDDS-14708. Move server code out of ozone-common (#9821)
---
hadoop-ozone/common/dev-support/findbugsExcludeFile.xml | 4 ----
hadoop-ozone/common/pom.xml | 4 ----
hadoop-ozone/interface-storage/pom.xml | 14 +++++++++-----
.../apache/hadoop/ozone/om/lock/DAGLeveledResource.java | 0
.../ozone/om/lock/HierarchicalResourceLockManager.java | 0
.../org/apache/hadoop/ozone/om/lock/IOzoneManagerLock.java | 0
.../org/apache/hadoop/ozone/om/lock/LockUsageInfo.java | 0
.../org/apache/hadoop/ozone/om/lock/OMLockDetails.java | 0
.../org/apache/hadoop/ozone/om/lock/OMLockMetrics.java | 0
.../java/org/apache/hadoop/ozone/om/lock/package-info.java | 0
.../hadoop/ozone/om/lock/TestDAGLeveledResource.java | 0
.../java/org/apache/hadoop/ozone/om/lock/package-info.java | 0
.../main/java/org/apache/hadoop/ozone/om/S3Batcher.java | 0
.../java/org/apache/hadoop/ozone/om/S3InMemoryCache.java | 0
.../java/org/apache/hadoop/ozone/om/S3SecretCache.java | 0
.../java/org/apache/hadoop/ozone/om/S3SecretFunction.java | 0
.../org/apache/hadoop/ozone/om/S3SecretLockedManager.java | 0
.../java/org/apache/hadoop/ozone/om/S3SecretManager.java | 0
.../java/org/apache/hadoop/ozone/om/S3SecretStore.java | 0
.../hadoop/ozone/om/lock/DAGResourceLockTracker.java | 0
.../hadoop/ozone/om/lock/LeveledResourceLockTracker.java | 0
.../org/apache/hadoop/ozone/om/lock/OmReadOnlyLock.java | 0
.../org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java | 0
.../om/lock/PoolBasedHierarchicalResourceLockManager.java | 0
.../om/lock/ReadOnlyHierarchicalResourceLockManager.java | 0
.../apache/hadoop/ozone/om/lock/ResourceLockTracker.java | 0
.../org/apache/hadoop/ozone/om/lock/TestKeyPathLock.java | 0
.../apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java | 0
.../lock/TestPoolBasedHierarchicalResourceLockManager.java | 0
29 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml
b/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml
index 0e32b4109fd..8d4b1dde76d 100644
--- a/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml
@@ -25,8 +25,4 @@
<Class name="org.apache.hadoop.ozone.security.TestGDPRSymmetricKey"/>
<Bug pattern="DLS_DEAD_LOCAL_STORE" />
</Match>
- <Match>
- <Class name="org.apache.hadoop.ozone.om.lock.TestOzoneManagerLock"/>
- <Bug pattern="IMSE_DONT_CATCH_IMSE" />
- </Match>
</FindBugsFilter>
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index ff4adbfd3bd..13a53cdc7a8 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -73,10 +73,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
diff --git a/hadoop-ozone/interface-storage/pom.xml
b/hadoop-ozone/interface-storage/pom.xml
index acf48a34e53..b1d5aba6aa2 100644
--- a/hadoop-ozone/interface-storage/pom.xml
+++ b/hadoop-ozone/interface-storage/pom.xml
@@ -37,6 +37,10 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
@@ -67,11 +71,6 @@
</dependency>
<!-- Test dependencies -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
@@ -84,6 +83,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/DAGLeveledResource.java
b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/DAGLeveledResource.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/DAGLeveledResource.java
rename to
hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/DAGLeveledResource.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/HierarchicalResourceLockManager.java
b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/HierarchicalResourceLockManager.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/HierarchicalResourceLockManager.java
rename to
hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/HierarchicalResourceLockManager.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/IOzoneManagerLock.java
b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/IOzoneManagerLock.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/IOzoneManagerLock.java
rename to
hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/IOzoneManagerLock.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/LockUsageInfo.java
b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/LockUsageInfo.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/LockUsageInfo.java
rename to
hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/LockUsageInfo.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OMLockDetails.java
b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/OMLockDetails.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OMLockDetails.java
rename to
hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/OMLockDetails.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OMLockMetrics.java
b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/OMLockMetrics.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OMLockMetrics.java
rename to
hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/OMLockMetrics.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/package-info.java
b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/package-info.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/package-info.java
rename to
hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/package-info.java
diff --git
a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestDAGLeveledResource.java
b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/lock/TestDAGLeveledResource.java
similarity index 100%
rename from
hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestDAGLeveledResource.java
rename to
hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/lock/TestDAGLeveledResource.java
diff --git
a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/package-info.java
b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/lock/package-info.java
similarity index 100%
rename from
hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/package-info.java
rename to
hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/lock/package-info.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3Batcher.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3Batcher.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3Batcher.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3Batcher.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3InMemoryCache.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3InMemoryCache.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3InMemoryCache.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3InMemoryCache.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretCache.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretCache.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretCache.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretCache.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretFunction.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretFunction.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretFunction.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretFunction.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretLockedManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretLockedManager.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretLockedManager.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretLockedManager.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManager.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretManager.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManager.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretStore.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretStore.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretStore.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretStore.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/DAGResourceLockTracker.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/DAGResourceLockTracker.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/DAGResourceLockTracker.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/DAGResourceLockTracker.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/LeveledResourceLockTracker.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/LeveledResourceLockTracker.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/LeveledResourceLockTracker.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/LeveledResourceLockTracker.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OmReadOnlyLock.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/OmReadOnlyLock.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OmReadOnlyLock.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/OmReadOnlyLock.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/PoolBasedHierarchicalResourceLockManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/PoolBasedHierarchicalResourceLockManager.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/PoolBasedHierarchicalResourceLockManager.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/PoolBasedHierarchicalResourceLockManager.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/ReadOnlyHierarchicalResourceLockManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/ReadOnlyHierarchicalResourceLockManager.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/ReadOnlyHierarchicalResourceLockManager.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/ReadOnlyHierarchicalResourceLockManager.java
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/ResourceLockTracker.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/ResourceLockTracker.java
similarity index 100%
rename from
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/ResourceLockTracker.java
rename to
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/lock/ResourceLockTracker.java
diff --git
a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestKeyPathLock.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestKeyPathLock.java
similarity index 100%
rename from
hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestKeyPathLock.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestKeyPathLock.java
diff --git
a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java
similarity index 100%
rename from
hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java
diff --git
a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestPoolBasedHierarchicalResourceLockManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestPoolBasedHierarchicalResourceLockManager.java
similarity index 100%
rename from
hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestPoolBasedHierarchicalResourceLockManager.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestPoolBasedHierarchicalResourceLockManager.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
