From 4752ddc4602c9591d026794931dc1287652795f0 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 24 Feb 2026 19:18:27 +0100 Subject: [PATCH 1/2] HDDS-14708. Move server code out of ozone-common --- .../dev-support/findbugsExcludeFile.xml | 4 --- hadoop-ozone/common/pom.xml | 4 --- hadoop-ozone/interface-storage/pom.xml | 30 +++++++++++++++---- .../ozone/om/lock/DAGLeveledResource.java | 0 .../ozone/om/lock/DAGResourceLockTracker.java | 0 .../lock/HierarchicalResourceLockManager.java | 0 .../ozone/om/lock/IOzoneManagerLock.java | 0 .../om/lock/LeveledResourceLockTracker.java | 0 .../hadoop/ozone/om/lock/LockUsageInfo.java | 0 .../hadoop/ozone/om/lock/OMLockDetails.java | 0 .../hadoop/ozone/om/lock/OMLockMetrics.java | 0 .../hadoop/ozone/om/lock/OmReadOnlyLock.java | 0 .../ozone/om/lock/OzoneManagerLock.java | 0 ...lBasedHierarchicalResourceLockManager.java | 0 ...adOnlyHierarchicalResourceLockManager.java | 0 .../ozone/om/lock/ResourceLockTracker.java | 0 .../hadoop/ozone/om/lock/package-info.java | 0 .../ozone/om/lock/TestDAGLeveledResource.java | 0 .../hadoop/ozone/om/lock/TestKeyPathLock.java | 0 .../ozone/om/lock/TestOzoneManagerLock.java | 0 ...lBasedHierarchicalResourceLockManager.java | 0 .../hadoop/ozone/om/lock/package-info.java | 0 .../org/apache/hadoop/ozone/om/S3Batcher.java | 0 .../hadoop/ozone/om/S3InMemoryCache.java | 0 .../apache/hadoop/ozone/om/S3SecretCache.java | 0 .../hadoop/ozone/om/S3SecretFunction.java | 0 .../ozone/om/S3SecretLockedManager.java | 0 .../hadoop/ozone/om/S3SecretManager.java | 0 .../apache/hadoop/ozone/om/S3SecretStore.java | 0 29 files changed, 25 insertions(+), 13 deletions(-) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/DAGLeveledResource.java (100%) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/DAGResourceLockTracker.java (100%) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/HierarchicalResourceLockManager.java (100%) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/IOzoneManagerLock.java (100%) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/LeveledResourceLockTracker.java (100%) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/LockUsageInfo.java (100%) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/OMLockDetails.java (100%) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/OMLockMetrics.java (100%) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/OmReadOnlyLock.java (100%) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java (100%) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/PoolBasedHierarchicalResourceLockManager.java (100%) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/ReadOnlyHierarchicalResourceLockManager.java (100%) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/ResourceLockTracker.java (100%) rename hadoop-ozone/{common => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/lock/package-info.java (100%) rename hadoop-ozone/{common => interface-storage}/src/test/java/org/apache/hadoop/ozone/om/lock/TestDAGLeveledResource.java (100%) rename hadoop-ozone/{common => interface-storage}/src/test/java/org/apache/hadoop/ozone/om/lock/TestKeyPathLock.java (100%) rename hadoop-ozone/{common => interface-storage}/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java (100%) rename hadoop-ozone/{common => interface-storage}/src/test/java/org/apache/hadoop/ozone/om/lock/TestPoolBasedHierarchicalResourceLockManager.java (100%) rename hadoop-ozone/{common => interface-storage}/src/test/java/org/apache/hadoop/ozone/om/lock/package-info.java (100%) rename hadoop-ozone/{common => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/S3Batcher.java (100%) rename hadoop-ozone/{common => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/S3InMemoryCache.java (100%) rename hadoop-ozone/{common => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/S3SecretCache.java (100%) rename hadoop-ozone/{common => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/S3SecretFunction.java (100%) rename hadoop-ozone/{common => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/S3SecretLockedManager.java (100%) rename hadoop-ozone/{common => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/S3SecretManager.java (100%) rename hadoop-ozone/{common => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/S3SecretStore.java (100%) diff --git a/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml b/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml index 0e32b4109fd8..8d4b1dde76d7 100644 --- a/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml +++ b/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml @@ -25,8 +25,4 @@ - - - - diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index ff4adbfd3bd1..13a53cdc7a88 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -73,10 +73,6 @@ org.apache.commons commons-lang3 - - org.apache.commons - commons-pool2 - org.apache.hadoop hadoop-common diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml index acf48a34e531..c41b72d90c8e 100644 --- a/hadoop-ozone/interface-storage/pom.xml +++ b/hadoop-ozone/interface-storage/pom.xml @@ -37,10 +37,26 @@ com.google.protobuf protobuf-java + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-pool2 + + + org.apache.hadoop + hadoop-common + org.apache.ozone hdds-common + + org.apache.ozone + hdds-config + org.apache.ozone hdds-interface-client @@ -65,13 +81,12 @@ org.apache.ratis ratis-common - - - org.apache.hadoop - hadoop-common - test + org.slf4j + slf4j-api + + org.apache.ozone hdds-common @@ -84,6 +99,11 @@ test-jar test + + org.apache.ozone + hdds-test-utils + test + 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/DAGResourceLockTracker.java b/hadoop-ozone/interface-storage/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/interface-storage/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/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/LeveledResourceLockTracker.java b/hadoop-ozone/interface-storage/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/interface-storage/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/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/OmReadOnlyLock.java b/hadoop-ozone/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/src/main/java/org/apache/hadoop/ozone/om/lock/ResourceLockTracker.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/TestKeyPathLock.java b/hadoop-ozone/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/src/test/java/org/apache/hadoop/ozone/om/lock/TestPoolBasedHierarchicalResourceLockManager.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 From 3cb30ed6586db383c0a6a2fbc8f933b033f288d5 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Fri, 6 Mar 2026 15:59:19 +0100 Subject: [PATCH 2/2] further move some classes to ozone-manager --- hadoop-ozone/interface-storage/pom.xml | 16 ---------------- .../ozone/om/lock/DAGResourceLockTracker.java | 0 .../om/lock/LeveledResourceLockTracker.java | 0 .../hadoop/ozone/om/lock/OmReadOnlyLock.java | 0 .../hadoop/ozone/om/lock/OzoneManagerLock.java | 0 ...PoolBasedHierarchicalResourceLockManager.java | 0 .../ReadOnlyHierarchicalResourceLockManager.java | 0 .../ozone/om/lock/ResourceLockTracker.java | 0 .../hadoop/ozone/om/lock/TestKeyPathLock.java | 0 .../ozone/om/lock/TestOzoneManagerLock.java | 0 ...PoolBasedHierarchicalResourceLockManager.java | 0 11 files changed, 16 deletions(-) rename hadoop-ozone/{interface-storage => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/lock/DAGResourceLockTracker.java (100%) rename hadoop-ozone/{interface-storage => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/lock/LeveledResourceLockTracker.java (100%) rename hadoop-ozone/{interface-storage => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/lock/OmReadOnlyLock.java (100%) rename hadoop-ozone/{interface-storage => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java (100%) rename hadoop-ozone/{interface-storage => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/lock/PoolBasedHierarchicalResourceLockManager.java (100%) rename hadoop-ozone/{interface-storage => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/lock/ReadOnlyHierarchicalResourceLockManager.java (100%) rename hadoop-ozone/{interface-storage => ozone-manager}/src/main/java/org/apache/hadoop/ozone/om/lock/ResourceLockTracker.java (100%) rename hadoop-ozone/{interface-storage => ozone-manager}/src/test/java/org/apache/hadoop/ozone/om/lock/TestKeyPathLock.java (100%) rename hadoop-ozone/{interface-storage => ozone-manager}/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java (100%) rename hadoop-ozone/{interface-storage => ozone-manager}/src/test/java/org/apache/hadoop/ozone/om/lock/TestPoolBasedHierarchicalResourceLockManager.java (100%) diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml index c41b72d90c8e..b1d5aba6aa20 100644 --- a/hadoop-ozone/interface-storage/pom.xml +++ b/hadoop-ozone/interface-storage/pom.xml @@ -37,14 +37,6 @@ com.google.protobuf protobuf-java - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-pool2 - org.apache.hadoop hadoop-common @@ -53,10 +45,6 @@ org.apache.ozone hdds-common - - org.apache.ozone - hdds-config - org.apache.ozone hdds-interface-client @@ -81,10 +69,6 @@ org.apache.ratis ratis-common - - org.slf4j - slf4j-api - diff --git a/hadoop-ozone/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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/interface-storage/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