This is an automated email from the ASF dual-hosted git repository.
gianm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 0ee04b40bd0 feat: Include caller thread name in LimitedPoolIndexMerger
threads. (#19376)
0ee04b40bd0 is described below
commit 0ee04b40bd098bda026141261aec0e2588ddd1eb
Author: Gian Merlino <[email protected]>
AuthorDate: Sat Apr 25 16:26:16 2026 -0700
feat: Include caller thread name in LimitedPoolIndexMerger threads. (#19376)
In Indexers (CliIndexer), a thread pool LimitedPoolIndexMerger is used
to control the concurrency of IndexMerger operations and avoid
excessive memory usage. This patch updates the thread names of this
pool to reflect the calling thread, which will include the task ID.
---
.../druid/common/guava/ThreadRenamingRunnable.java | 52 ----------------------
.../UnifiedIndexerAppenderatorsManager.java | 36 +++++++++++----
2 files changed, 28 insertions(+), 60 deletions(-)
diff --git
a/processing/src/main/java/org/apache/druid/common/guava/ThreadRenamingRunnable.java
b/processing/src/main/java/org/apache/druid/common/guava/ThreadRenamingRunnable.java
deleted file mode 100644
index 34446d74d8e..00000000000
---
a/processing/src/main/java/org/apache/druid/common/guava/ThreadRenamingRunnable.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, 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.
- */
-
-package org.apache.druid.common.guava;
-
-/**
- */
-public abstract class ThreadRenamingRunnable implements Runnable
-{
- private final String name;
-
- public ThreadRenamingRunnable(
- String name
- )
- {
- this.name = name;
- }
-
- @Override
- public final void run()
- {
- final Thread currThread = Thread.currentThread();
- String currName = currThread.getName();
- try {
- currThread.setName(name);
- doRun();
- }
- finally {
- currThread.setName(currName);
- }
-
- }
-
- public abstract void doRun();
-}
-
diff --git
a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/UnifiedIndexerAppenderatorsManager.java
b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/UnifiedIndexerAppenderatorsManager.java
index 9eafd853d3f..e6ee87f14ce 100644
---
a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/UnifiedIndexerAppenderatorsManager.java
+++
b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/UnifiedIndexerAppenderatorsManager.java
@@ -555,16 +555,26 @@ public class UnifiedIndexerAppenderatorsManager
implements AppenderatorsManager
@Nullable SegmentWriteOutMediumFactory segmentWriteOutMediumFactory
)
{
- ListenableFuture<File> mergeFuture = mergeExecutor.submit(
- () ->
- baseMerger.persist(
+ // Include calling thread's name in the mergeExecutor thread name. This
includes at least the task ID.
+ final String callerThreadName = Thread.currentThread().getName();
+ final ListenableFuture<File> mergeFuture = mergeExecutor.submit(
+ () -> {
+ final String runnableThreadName = Thread.currentThread().getName();
+ try {
+ Thread.currentThread().setName(runnableThreadName + "[" +
callerThreadName + "]");
+ return baseMerger.persist(
index,
dataInterval,
outDir,
indexSpec,
progress,
segmentWriteOutMediumFactory
- )
+ );
+ }
+ finally {
+ Thread.currentThread().setName(runnableThreadName);
+ }
+ }
);
try {
@@ -604,9 +614,14 @@ public class UnifiedIndexerAppenderatorsManager implements
AppenderatorsManager
int maxColumnsToMerge
)
{
- ListenableFuture<File> mergeFuture = mergeExecutor.submit(
- () ->
- baseMerger.mergeQueryableIndex(
+ // Include calling thread's name in the mergeExecutor thread name. This
includes at least the task ID.
+ final String callerThreadName = Thread.currentThread().getName();
+ final ListenableFuture<File> mergeFuture = mergeExecutor.submit(
+ () -> {
+ final String runnableThreadName = Thread.currentThread().getName();
+ try {
+ Thread.currentThread().setName(runnableThreadName + "[" +
callerThreadName + "]");
+ return baseMerger.mergeQueryableIndex(
indexes,
rollup,
metricAggs,
@@ -617,7 +632,12 @@ public class UnifiedIndexerAppenderatorsManager implements
AppenderatorsManager
new BaseProgressIndicator(),
segmentWriteOutMediumFactory,
maxColumnsToMerge
- )
+ );
+ }
+ finally {
+ Thread.currentThread().setName(runnableThreadName);
+ }
+ }
);
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
