Skip to content

Commit 3208423

Browse files
committed
Remove unnecessary change
1 parent 420739e commit 3208423

File tree

6 files changed

+7
-17
lines changed

6 files changed

+7
-17
lines changed

server/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,4 +613,5 @@ public double getEwmaAlpha() {
613613
return ewmaAlpha;
614614
}
615615
}
616+
616617
}

server/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.elasticsearch.common.settings.Settings;
1414
import org.elasticsearch.common.util.concurrent.EsExecutors;
1515
import org.elasticsearch.common.util.concurrent.ThreadContext;
16-
import org.elasticsearch.telemetry.metric.MeterRegistry;
1716

1817
import java.util.List;
1918

@@ -71,10 +70,9 @@ protected static int applyHardSizeLimit(final Settings settings, final String na
7170
*
7271
* @param settings the executor settings
7372
* @param threadContext the current thread context
74-
* @param meterRegistry the meter registry
7573
* @return a new executor built from the specified executor settings
7674
*/
77-
abstract ThreadPool.ExecutorHolder build(U settings, ThreadContext threadContext, MeterRegistry meterRegistry);
75+
abstract ThreadPool.ExecutorHolder build(U settings, ThreadContext threadContext);
7876

7977
/**
8078
* Format the thread pool info object for this executor.

server/src/main/java/org/elasticsearch/threadpool/FixedExecutorBuilder.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.elasticsearch.common.util.concurrent.EsExecutors.TaskTrackingConfig;
1717
import org.elasticsearch.common.util.concurrent.ThreadContext;
1818
import org.elasticsearch.node.Node;
19-
import org.elasticsearch.telemetry.metric.MeterRegistry;
2019

2120
import java.util.Arrays;
2221
import java.util.List;
@@ -143,11 +142,7 @@ FixedExecutorSettings getSettings(Settings settings) {
143142
}
144143

145144
@Override
146-
ThreadPool.ExecutorHolder build(
147-
final FixedExecutorSettings settings,
148-
final ThreadContext threadContext,
149-
final MeterRegistry meterRegistry
150-
) {
145+
ThreadPool.ExecutorHolder build(final FixedExecutorSettings settings, final ThreadContext threadContext) {
151146
int size = settings.size;
152147
int queueSize = settings.queueSize;
153148
final ThreadFactory threadFactory = EsExecutors.daemonThreadFactory(settings.nodeName, name(), isSystemThread());

server/src/main/java/org/elasticsearch/threadpool/ScalingExecutorBuilder.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.elasticsearch.common.util.concurrent.ThreadContext;
1616
import org.elasticsearch.core.TimeValue;
1717
import org.elasticsearch.node.Node;
18-
import org.elasticsearch.telemetry.metric.MeterRegistry;
1918

2019
import java.util.Arrays;
2120
import java.util.List;
@@ -132,11 +131,7 @@ ScalingExecutorSettings getSettings(Settings settings) {
132131
return new ScalingExecutorSettings(nodeName, coreThreads, maxThreads, keepAlive);
133132
}
134133

135-
ThreadPool.ExecutorHolder build(
136-
final ScalingExecutorSettings settings,
137-
final ThreadContext threadContext,
138-
final MeterRegistry meterRegistry
139-
) {
134+
ThreadPool.ExecutorHolder build(final ScalingExecutorSettings settings, final ThreadContext threadContext) {
140135
TimeValue keepAlive = settings.keepAlive;
141136
int core = settings.core;
142137
int max = settings.max;

server/src/main/java/org/elasticsearch/threadpool/ThreadPool.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public ThreadPool(
303303
final Map<String, ExecutorHolder> executors = new HashMap<>();
304304
for (final Map.Entry<String, ExecutorBuilder> entry : builders.entrySet()) {
305305
final ExecutorBuilder.ExecutorSettings executorSettings = entry.getValue().getSettings(settings);
306-
final ExecutorHolder executorHolder = entry.getValue().build(executorSettings, threadContext, meterRegistry);
306+
final ExecutorHolder executorHolder = entry.getValue().build(executorSettings, threadContext);
307307
if (executors.containsKey(executorHolder.info.getName())) {
308308
throw new IllegalStateException("duplicate executors with name [" + executorHolder.info.getName() + "] registered");
309309
}

server/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,8 @@ public void testScalingWithTaskTimeTracking() {
706706
randomTimeUnit(),
707707
randomBoolean(),
708708
EsExecutors.daemonThreadFactory("test"),
709-
threadContext
709+
threadContext,
710+
DO_NOT_TRACK
710711
);
711712
assertThat(pool, instanceOf(EsThreadPoolExecutor.class));
712713
}

0 commit comments

Comments
 (0)