move settings registration and test

ywangd · ywangd · commit 61687b10f415 · 2026-01-09T11:18:18.000+11:00
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/common/util/concurrent/ThreadPoolHotThreadsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/common/util/concurrent/ThreadPoolHotThreadsIT.java
diff --git a/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java
@@ -138,7 +138,6 @@
 import org.elasticsearch.snapshots.RestoreService;
 import org.elasticsearch.snapshots.SnapshotShutdownProgressTracker;
 import org.elasticsearch.snapshots.SnapshotsService;
-import org.elasticsearch.threadpool.ScalingExecutorBuilder;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.RemoteClusterPortSettings;
 import org.elasticsearch.transport.RemoteClusterSettings;
@@ -562,9 +561,6 @@ public void apply(Settings value, Settings current, Settings previous) {
         ThreadPool.LATE_TIME_INTERVAL_WARN_THRESHOLD_SETTING,
         ThreadPool.SLOW_SCHEDULER_TASK_WARN_THRESHOLD_SETTING,
         ThreadPool.WRITE_THREAD_POOLS_EWMA_ALPHA_SETTING,
-        ScalingExecutorBuilder.HOT_THREADS_ON_LARGE_QUEUE_SIZE_THRESHOLD_SETTING,
-        ScalingExecutorBuilder.HOT_THREADS_ON_LARGE_QUEUE_DURATION_THRESHOLD_SETTING,
-        ScalingExecutorBuilder.HOT_THREADS_ON_LARGE_QUEUE_INTERVAL_SETTING,
         FastVectorHighlighter.SETTING_TV_HIGHLIGHT_MULTI_VALUE,
         Node.BREAKER_TYPE_KEY,
         OperationRouting.USE_ADAPTIVE_REPLICA_SELECTION_SETTING,
diff --git a/test/framework/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutorTestHelper.java b/test/framework/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutorTestHelper.java
@@ -0,0 +1,58 @@
+/*
+ * ELASTICSEARCH CONFIDENTIAL
+ * __________________
+ *
+ * Copyright Elasticsearch B.V. All rights reserved.
+ *
+ * NOTICE:  All information contained herein is, and remains
+ * the property of Elasticsearch B.V. and its suppliers, if any.
+ * The intellectual and technical concepts contained herein
+ * are proprietary to Elasticsearch B.V. and its suppliers and
+ * may be covered by U.S. and Foreign Patents, patents in
+ * process, and are protected by trade secret or copyright
+ * law.  Dissemination of this information or reproduction of
+ * this material is strictly forbidden unless prior written
+ * permission is obtained from Elasticsearch B.V.
+ */
+
+package org.elasticsearch.common.util.concurrent;
+
+import org.elasticsearch.common.settings.Settings;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.LongSupplier;
+
+import static org.elasticsearch.test.ESTestCase.randomIdentifier;
+
+public class EsThreadPoolExecutorTestHelper {
+
+    public static EsExecutors.HotThreadsOnLargeQueueConfig getHotThreadsOnLargeQueueConfig(EsThreadPoolExecutor executor) {
+        return executor.getHotThreadsOnLargeQueueConfig();
+    }
+
+    public static long getStartTimeOfLargeQueue(EsThreadPoolExecutor executor) {
+        return executor.getStartTimeOfLargeQueue();
+    }
+
+    public static EsThreadPoolExecutor newEsThreadPoolExecutor(
+        String name,
+        int corePoolSize,
+        int maximumPoolSize,
+        EsExecutors.HotThreadsOnLargeQueueConfig hotThreadsOnLargeQueueConfig,
+        LongSupplier currentTimeMillisSupplier
+    ) {
+        return new EsThreadPoolExecutor(
+            name,
+            corePoolSize,
+            maximumPoolSize,
+            5,
+            TimeUnit.MINUTES,
+            new EsExecutors.ExecutorScalingQueue<>(),
+            EsExecutors.daemonThreadFactory(randomIdentifier(), name),
+            new EsExecutors.ForceQueuePolicy(false, false),
+            new ThreadContext(Settings.EMPTY),
+            hotThreadsOnLargeQueueConfig,
+            currentTimeMillisSupplier
+        );
+    }
+}
