This is an automated email from the ASF dual-hosted git repository.
ivandika3 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 27e3e46fef9 HDDS-15470. Disk usage refresh thread name has newline
(#10422)
27e3e46fef9 is described below
commit 27e3e46fef9632cbcb4adf4fe985f3f9406ececa
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Jun 4 03:07:42 2026 +0200
HDDS-15470. Disk usage refresh thread name has newline (#10422)
---
.../apache/hadoop/hdds/fs/CachingSpaceUsageSource.java | 13 +++++++++----
.../hadoop/hdds/fs/TestCachingSpaceUsageSource.java | 15 +++++++++++++++
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/CachingSpaceUsageSource.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/CachingSpaceUsageSource.java
index 9cd192287cd..155b5e243fe 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/CachingSpaceUsageSource.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/CachingSpaceUsageSource.java
@@ -26,6 +26,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.hadoop.hdds.annotation.InterfaceAudience;
import org.apache.hadoop.hdds.annotation.InterfaceStability;
@@ -259,9 +260,13 @@ private void refresh() {
return null;
}
- return Executors.newScheduledThreadPool(1,
- new ThreadFactoryBuilder().setDaemon(true)
- .setNameFormat("DiskUsage-" + params.getPath() + "-%n")
- .build());
+ return Executors.newScheduledThreadPool(1, threadFactoryFor(params));
+ }
+
+ static ThreadFactory threadFactoryFor(SpaceUsageCheckParams params) {
+ return new ThreadFactoryBuilder()
+ .setDaemon(true)
+ .setNameFormat("DiskUsage-" + params.getPath() + "-%d")
+ .build();
}
}
diff --git
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestCachingSpaceUsageSource.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestCachingSpaceUsageSource.java
index f6b79830ceb..181cee07a57 100644
---
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestCachingSpaceUsageSource.java
+++
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestCachingSpaceUsageSource.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.hdds.fs;
import static org.apache.hadoop.hdds.fs.MockSpaceUsageCheckParams.newBuilder;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyLong;
@@ -31,6 +32,7 @@
import java.time.Duration;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.lang3.RandomUtils;
@@ -217,6 +219,19 @@ void decrementUsedSpaceIgnoresNegativeValue() {
assertSnapshotIsUpToDate(subject);
}
+ @Test
+ void testThreadName() {
+ SpaceUsageCheckParams params = paramsBuilder(new AtomicLong(50))
+ .build();
+ ThreadFactory subject = CachingSpaceUsageSource.threadFactoryFor(params);
+
+ for (int i = 0; i < 3; i++) {
+ assertThat(subject.newThread(() -> { }).getName())
+ .doesNotContain("\n")
+ .endsWith("-" + i);
+ }
+ }
+
private static void assertSnapshotIsUpToDate(SpaceUsageSource subject) {
SpaceUsageSource snapshot = subject.snapshot();
assertEquals(subject.getCapacity(), snapshot.getCapacity());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
