This is an automated email from the ASF dual-hosted git repository.
nanda 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 540f67b12f HDDS-12353. Move SpaceUsage implementations to
hdds-server-framework (#7926)
540f67b12f is described below
commit 540f67b12f166e55fec09296cae64d4376ff7953
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Sat Feb 22 05:44:40 2025 +0100
HDDS-12353. Move SpaceUsage implementations to hdds-server-framework (#7926)
---
.../hadoop/hdds/fs/AbstractSpaceUsageSource.java | 0
.../hadoop/hdds/fs/CachingSpaceUsageSource.java | 0
.../main/java/org/apache/hadoop/hdds/fs/DU.java | 0
.../java/org/apache/hadoop/hdds/fs/DUFactory.java | 0
.../hadoop/hdds/fs/DedicatedDiskSpaceUsage.java | 0
.../hdds/fs/DedicatedDiskSpaceUsageFactory.java | 0
.../hadoop/hdds/fs/SaveSpaceUsageToFile.java | 0
.../hadoop/hdds/fs/SpaceUsageCheckFactory.java | 0
.../hadoop/hdds/fs/SpaceUsageCheckParams.java | 0
.../hadoop/hdds/fs/SpaceUsagePersistence.java | 0
.../org/apache/hadoop/hdds/fs/package-info.java} | 31 ++--------------------
.../hadoop/hdds/fs/MockSpaceUsageCheckFactory.java | 0
.../hadoop/hdds/fs/MockSpaceUsageCheckParams.java | 0
.../hadoop/hdds/fs/MockSpaceUsagePersistence.java | 0
.../hadoop/hdds/fs/MockSpaceUsageSource.java | 0
.../hdds/fs/TestCachingSpaceUsageSource.java | 0
.../java/org/apache/hadoop/hdds/fs/TestDU.java | 0
.../org/apache/hadoop/hdds/fs/TestDUFactory.java | 0
.../hdds/fs/TestDedicatedDiskSpaceUsage.java | 0
.../fs/TestDedicatedDiskSpaceUsageFactory.java | 0
.../hadoop/hdds/fs/TestSaveSpaceUsageToFile.java | 0
.../hadoop/hdds/fs/TestSpaceUsageFactory.java | 0
22 files changed, 2 insertions(+), 29 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/AbstractSpaceUsageSource.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/AbstractSpaceUsageSource.java
similarity index 100%
rename from
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/AbstractSpaceUsageSource.java
rename to
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/AbstractSpaceUsageSource.java
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/CachingSpaceUsageSource.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/CachingSpaceUsageSource.java
similarity index 100%
rename from
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/CachingSpaceUsageSource.java
rename to
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/CachingSpaceUsageSource.java
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/DU.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/DU.java
similarity index 100%
rename from hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/DU.java
rename to hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/DU.java
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/DUFactory.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/DUFactory.java
similarity index 100%
rename from
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/DUFactory.java
rename to
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/DUFactory.java
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/DedicatedDiskSpaceUsage.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/DedicatedDiskSpaceUsage.java
similarity index 100%
rename from
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/DedicatedDiskSpaceUsage.java
rename to
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/DedicatedDiskSpaceUsage.java
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/DedicatedDiskSpaceUsageFactory.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/DedicatedDiskSpaceUsageFactory.java
similarity index 100%
rename from
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/DedicatedDiskSpaceUsageFactory.java
rename to
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/DedicatedDiskSpaceUsageFactory.java
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/SaveSpaceUsageToFile.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/SaveSpaceUsageToFile.java
similarity index 100%
rename from
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/SaveSpaceUsageToFile.java
rename to
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/SaveSpaceUsageToFile.java
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/SpaceUsageCheckFactory.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/SpaceUsageCheckFactory.java
similarity index 100%
rename from
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/SpaceUsageCheckFactory.java
rename to
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/SpaceUsageCheckFactory.java
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/SpaceUsageCheckParams.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/SpaceUsageCheckParams.java
similarity index 100%
rename from
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/SpaceUsageCheckParams.java
rename to
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/SpaceUsageCheckParams.java
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/SpaceUsagePersistence.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/SpaceUsagePersistence.java
similarity index 100%
rename from
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/SpaceUsagePersistence.java
rename to
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/SpaceUsagePersistence.java
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDedicatedDiskSpaceUsage.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/package-info.java
similarity index 52%
copy from
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDedicatedDiskSpaceUsage.java
copy to
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/package-info.java
index 52784ecd9e..62482b8f53 100644
---
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDedicatedDiskSpaceUsage.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/package-info.java
@@ -15,34 +15,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.hdds.fs;
-
-import static org.apache.hadoop.hdds.fs.TestDU.createFile;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.File;
-import java.io.IOException;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
/**
- * Tests for {@link DedicatedDiskSpaceUsage}.
+ * Filesystem-related utilities.
*/
-class TestDedicatedDiskSpaceUsage {
-
- @TempDir
- private File dir;
-
- private static final int FILE_SIZE = 1024;
-
- @Test
- void testGetUsed() throws IOException {
- File file = new File(dir, "data");
- createFile(file, FILE_SIZE);
- SpaceUsageSource subject = new DedicatedDiskSpaceUsage(dir);
-
- // condition comes from TestDFCachingGetSpaceUsed in Hadoop Common
- assertThat(subject.getUsedSpace()).isGreaterThanOrEqualTo(FILE_SIZE - 20);
- }
-
-}
+package org.apache.hadoop.hdds.fs;
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsageCheckFactory.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsageCheckFactory.java
similarity index 100%
rename from
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsageCheckFactory.java
rename to
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsageCheckFactory.java
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsageCheckParams.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsageCheckParams.java
similarity index 100%
rename from
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsageCheckParams.java
rename to
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsageCheckParams.java
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsagePersistence.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsagePersistence.java
similarity index 100%
rename from
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsagePersistence.java
rename to
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsagePersistence.java
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsageSource.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsageSource.java
similarity index 100%
rename from
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsageSource.java
rename to
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/MockSpaceUsageSource.java
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestCachingSpaceUsageSource.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestCachingSpaceUsageSource.java
similarity index 100%
rename from
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestCachingSpaceUsageSource.java
rename to
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestCachingSpaceUsageSource.java
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDU.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestDU.java
similarity index 100%
rename from
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDU.java
rename to
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestDU.java
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDUFactory.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestDUFactory.java
similarity index 100%
rename from
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDUFactory.java
rename to
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestDUFactory.java
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDedicatedDiskSpaceUsage.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestDedicatedDiskSpaceUsage.java
similarity index 100%
rename from
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDedicatedDiskSpaceUsage.java
rename to
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestDedicatedDiskSpaceUsage.java
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDedicatedDiskSpaceUsageFactory.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestDedicatedDiskSpaceUsageFactory.java
similarity index 100%
rename from
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDedicatedDiskSpaceUsageFactory.java
rename to
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestDedicatedDiskSpaceUsageFactory.java
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestSaveSpaceUsageToFile.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestSaveSpaceUsageToFile.java
similarity index 100%
rename from
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestSaveSpaceUsageToFile.java
rename to
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestSaveSpaceUsageToFile.java
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestSpaceUsageFactory.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestSpaceUsageFactory.java
similarity index 100%
rename from
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestSpaceUsageFactory.java
rename to
hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestSpaceUsageFactory.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
