Skip to content

Commit b09863a

Browse files
albertzaharovitsalbertzaharovits
committed
Rename ThreadPoolMergeQueue -> ThreadPoolMergeExecutorService
1 parent 6401d86 commit b09863a

File tree

14 files changed

+72
-72
lines changed

14 files changed

+72
-72
lines changed

‎server/src/main/java/org/elasticsearch/index/IndexModule.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.elasticsearch.index.cache.query.QueryCache;
4444
import org.elasticsearch.index.engine.Engine;
4545
import org.elasticsearch.index.engine.EngineFactory;
46-
import org.elasticsearch.index.engine.ThreadPoolMergeQueue;
46+
import org.elasticsearch.index.engine.ThreadPoolMergeExecutorService;
4747
import org.elasticsearch.index.mapper.IdFieldMapper;
4848
import org.elasticsearch.index.mapper.MapperMetrics;
4949
import org.elasticsearch.index.mapper.MapperRegistry;
@@ -471,7 +471,7 @@ public IndexService newIndexService(
471471
CircuitBreakerService circuitBreakerService,
472472
BigArrays bigArrays,
473473
ThreadPool threadPool,
474-
ThreadPoolMergeQueue threadPoolMergeQueue,
474+
ThreadPoolMergeExecutorService threadPoolMergeExecutorService,
475475
ScriptService scriptService,
476476
ClusterService clusterService,
477477
Client client,
@@ -525,7 +525,7 @@ public IndexService newIndexService(
525525
circuitBreakerService,
526526
bigArrays,
527527
threadPool,
528-
threadPoolMergeQueue,
528+
threadPoolMergeExecutorService,
529529
scriptService,
530530
clusterService,
531531
client,

‎server/src/main/java/org/elasticsearch/index/IndexService.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import org.elasticsearch.index.cache.query.QueryCache;
5050
import org.elasticsearch.index.engine.Engine;
5151
import org.elasticsearch.index.engine.EngineFactory;
52-
import org.elasticsearch.index.engine.ThreadPoolMergeQueue;
52+
import org.elasticsearch.index.engine.ThreadPoolMergeExecutorService;
5353
import org.elasticsearch.index.fielddata.FieldDataContext;
5454
import org.elasticsearch.index.fielddata.IndexFieldData;
5555
import org.elasticsearch.index.fielddata.IndexFieldDataCache;
@@ -156,7 +156,7 @@ public class IndexService extends AbstractIndexComponent implements IndicesClust
156156
private final AsyncTrimTranslogTask trimTranslogTask;
157157
private final ThreadPool threadPool;
158158
@Nullable
159-
private final ThreadPoolMergeQueue threadPoolMergeQueue;
159+
private final ThreadPoolMergeExecutorService threadPoolMergeExecutorService;
160160
private final BigArrays bigArrays;
161161
private final ScriptService scriptService;
162162
private final ClusterService clusterService;
@@ -181,7 +181,7 @@ public IndexService(
181181
CircuitBreakerService circuitBreakerService,
182182
BigArrays bigArrays,
183183
ThreadPool threadPool,
184-
ThreadPoolMergeQueue threadPoolMergeQueue,
184+
ThreadPoolMergeExecutorService threadPoolMergeExecutorService,
185185
ScriptService scriptService,
186186
ClusterService clusterService,
187187
Client client,
@@ -265,7 +265,7 @@ public IndexService(
265265
this.indexFoldersDeletionListener = indexFoldersDeletionListener;
266266
this.bigArrays = bigArrays;
267267
this.threadPool = threadPool;
268-
this.threadPoolMergeQueue = threadPoolMergeQueue;
268+
this.threadPoolMergeExecutorService = threadPoolMergeExecutorService;
269269
this.scriptService = scriptService;
270270
this.clusterService = clusterService;
271271
this.client = client;
@@ -561,7 +561,7 @@ public synchronized IndexShard createShard(
561561
eventListener,
562562
readerWrapper,
563563
threadPool,
564-
threadPoolMergeQueue,
564+
threadPoolMergeExecutorService,
565565
bigArrays,
566566
engineWarmer,
567567
searchOperationListeners,
@@ -826,8 +826,8 @@ public ThreadPool getThreadPool() {
826826
return threadPool;
827827
}
828828

829-
public @Nullable ThreadPoolMergeQueue getThreadPoolMergeQueue() {
830-
return threadPoolMergeQueue;
829+
public @Nullable ThreadPoolMergeExecutorService getThreadPoolMergeQueue() {
830+
return threadPoolMergeExecutorService;
831831
}
832832

833833
/**

‎server/src/main/java/org/elasticsearch/index/engine/EngineConfig.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public final class EngineConfig {
5959
private final IndexStorePlugin.SnapshotCommitSupplier snapshotCommitSupplier;
6060
private final ThreadPool threadPool;
6161
@Nullable
62-
private final ThreadPoolMergeQueue threadPoolMergeQueue;
62+
private final ThreadPoolMergeExecutorService threadPoolMergeExecutorService;
6363
private final Engine.Warmer warmer;
6464
private final Store store;
6565
private final MergePolicy mergePolicy;
@@ -152,7 +152,7 @@ public Supplier<RetentionLeases> retentionLeasesSupplier() {
152152
public EngineConfig(
153153
ShardId shardId,
154154
ThreadPool threadPool,
155-
ThreadPoolMergeQueue threadPoolMergeQueue,
155+
ThreadPoolMergeExecutorService threadPoolMergeExecutorService,
156156
IndexSettings indexSettings,
157157
Engine.Warmer warmer,
158158
Store store,
@@ -182,7 +182,7 @@ public EngineConfig(
182182
this.shardId = shardId;
183183
this.indexSettings = indexSettings;
184184
this.threadPool = threadPool;
185-
this.threadPoolMergeQueue = threadPoolMergeQueue;
185+
this.threadPoolMergeExecutorService = threadPoolMergeExecutorService;
186186
this.warmer = warmer == null ? (a) -> {} : warmer;
187187
this.store = store;
188188
this.mergePolicy = mergePolicy;
@@ -291,8 +291,8 @@ public ThreadPool getThreadPool() {
291291
return threadPool;
292292
}
293293

294-
public @Nullable ThreadPoolMergeQueue getThreadPoolMergeQueue() {
295-
return threadPoolMergeQueue;
294+
public @Nullable ThreadPoolMergeExecutorService getThreadPoolMergeQueue() {
295+
return threadPoolMergeExecutorService;
296296
}
297297

298298
/**

‎server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2855,18 +2855,18 @@ protected void doRun() {
28552855
protected ElasticsearchMergeScheduler createMergeScheduler(
28562856
ShardId shardId,
28572857
IndexSettings indexSettings,
2858-
@Nullable ThreadPoolMergeQueue threadPoolMergeQueue
2858+
@Nullable ThreadPoolMergeExecutorService threadPoolMergeExecutorService
28592859
) {
2860-
if (threadPoolMergeQueue != null) {
2861-
return new EngineThreadPoolMergeScheduler(shardId, indexSettings, threadPoolMergeQueue);
2860+
if (threadPoolMergeExecutorService != null) {
2861+
return new EngineThreadPoolMergeScheduler(shardId, indexSettings, threadPoolMergeExecutorService);
28622862
} else {
28632863
return new EngineConcurrentMergeScheduler(shardId, indexSettings);
28642864
}
28652865
}
28662866

28672867
private final class EngineThreadPoolMergeScheduler extends ThreadPoolMergeScheduler {
2868-
EngineThreadPoolMergeScheduler(ShardId shardId, IndexSettings indexSettings, ThreadPoolMergeQueue threadPoolMergeQueue) {
2869-
super(shardId, indexSettings, threadPoolMergeQueue);
2868+
EngineThreadPoolMergeScheduler(ShardId shardId, IndexSettings indexSettings, ThreadPoolMergeExecutorService threadPoolMergeExecutorService) {
2869+
super(shardId, indexSettings, threadPoolMergeExecutorService);
28702870
}
28712871

28722872
@Override

server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeQueue.java renamed to server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.concurrent.atomic.AtomicInteger;
2424
import java.util.concurrent.atomic.AtomicLong;
2525

26-
public class ThreadPoolMergeQueue {
26+
public class ThreadPoolMergeExecutorService {
2727
/**
2828
* Floor for IO write rate limit of individual merge tasks (we will never go any lower than this)
2929
*/
@@ -49,15 +49,15 @@ public class ThreadPoolMergeQueue {
4949
private final ExecutorService executorService;
5050
private final int maxConcurrentMerges;
5151

52-
public static @Nullable ThreadPoolMergeQueue maybeCreateThreadPoolMergeQueue(ThreadPool threadPool, Settings settings) {
52+
public static @Nullable ThreadPoolMergeExecutorService maybeCreateThreadPoolMergeQueue(ThreadPool threadPool, Settings settings) {
5353
if (ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.get(settings)) {
54-
return new ThreadPoolMergeQueue(threadPool);
54+
return new ThreadPoolMergeExecutorService(threadPool);
5555
} else {
5656
return null;
5757
}
5858
}
5959

60-
private ThreadPoolMergeQueue(ThreadPool threadPool) {
60+
private ThreadPoolMergeExecutorService(ThreadPool threadPool) {
6161
this.executorService = threadPool.executor(ThreadPool.Names.MERGE);
6262
this.maxConcurrentMerges = threadPool.info(ThreadPool.Names.MERGE).getMax();
6363
}

‎server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeScheduler.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class ThreadPoolMergeScheduler extends MergeScheduler implements Elastics
4949
private final MergeSchedulerConfig config;
5050
private final Logger logger;
5151
private final MergeTracking mergeTracking;
52-
private final ThreadPoolMergeQueue threadPoolMergeQueue;
52+
private final ThreadPoolMergeExecutorService threadPoolMergeExecutorService;
5353
private final PriorityQueue<MergeTask> backloggedMergeTasks = new PriorityQueue<>();
5454
private final Map<MergePolicy.OneMerge, MergeTask> currentlyRunningMergeTasks = new HashMap<>();
5555
// set when incoming merges should be throttled (i.e. restrict the indexing rate)
@@ -60,15 +60,15 @@ public class ThreadPoolMergeScheduler extends MergeScheduler implements Elastics
6060
private final CountDownLatch closedWithNoCurrentlyRunningMerges = new CountDownLatch(1);
6161
private volatile boolean closed = false;
6262

63-
public ThreadPoolMergeScheduler(ShardId shardId, IndexSettings indexSettings, ThreadPoolMergeQueue threadPoolMergeQueue) {
63+
public ThreadPoolMergeScheduler(ShardId shardId, IndexSettings indexSettings, ThreadPoolMergeExecutorService threadPoolMergeExecutorService) {
6464
this.shardId = shardId;
6565
this.config = indexSettings.getMergeSchedulerConfig();
6666
this.logger = Loggers.getLogger(getClass(), shardId);
6767
this.mergeTracking = new MergeTracking(
6868
logger,
69-
() -> this.config.isAutoThrottle() ? threadPoolMergeQueue.getTargetMBPerSec() : Double.POSITIVE_INFINITY
69+
() -> this.config.isAutoThrottle() ? threadPoolMergeExecutorService.getTargetMBPerSec() : Double.POSITIVE_INFINITY
7070
);
71-
this.threadPoolMergeQueue = threadPoolMergeQueue;
71+
this.threadPoolMergeExecutorService = threadPoolMergeExecutorService;
7272
}
7373

7474
@Override
@@ -143,7 +143,7 @@ protected void handleMergeException(Throwable t) {
143143

144144
private void submitNewMergeTask(MergeSource mergeSource, MergePolicy.OneMerge merge, MergeTrigger mergeTrigger) {
145145
MergeTask mergeTask = newMergeTask(mergeSource, merge, mergeTrigger);
146-
threadPoolMergeQueue.submitMergeTask(mergeTask);
146+
threadPoolMergeExecutorService.submitMergeTask(mergeTask);
147147
checkMergeTaskThrottling();
148148
}
149149

@@ -218,7 +218,7 @@ private synchronized void enqueueBackloggedTasks() {
218218
break;
219219
}
220220
// no need to abort merge tasks now, they will be aborted when the scheduler tries to run them
221-
threadPoolMergeQueue.enqueueMergeTask(backloggedMergeTask);
221+
threadPoolMergeExecutorService.enqueueMergeTask(backloggedMergeTask);
222222
}
223223
}
224224

‎server/src/main/java/org/elasticsearch/index/shard/IndexShard.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
import org.elasticsearch.index.engine.SafeCommitInfo;
9797
import org.elasticsearch.index.engine.Segment;
9898
import org.elasticsearch.index.engine.SegmentsStats;
99-
import org.elasticsearch.index.engine.ThreadPoolMergeQueue;
99+
import org.elasticsearch.index.engine.ThreadPoolMergeExecutorService;
100100
import org.elasticsearch.index.fielddata.FieldDataStats;
101101
import org.elasticsearch.index.fielddata.ShardFieldData;
102102
import org.elasticsearch.index.flush.FlushStats;
@@ -195,7 +195,7 @@ public class IndexShard extends AbstractIndexShardComponent implements IndicesCl
195195

196196
private final ThreadPool threadPool;
197197
@Nullable
198-
private final ThreadPoolMergeQueue threadPoolMergeQueue;
198+
private final ThreadPoolMergeExecutorService threadPoolMergeExecutorService;
199199
private final MapperService mapperService;
200200
private final IndexCache indexCache;
201201
private final Store store;
@@ -319,7 +319,7 @@ public IndexShard(
319319
final IndexEventListener indexEventListener,
320320
final CheckedFunction<DirectoryReader, DirectoryReader, IOException> indexReaderWrapper,
321321
final ThreadPool threadPool,
322-
final ThreadPoolMergeQueue threadPoolMergeQueue,
322+
final ThreadPoolMergeExecutorService threadPoolMergeExecutorService,
323323
final BigArrays bigArrays,
324324
final Engine.Warmer warmer,
325325
final List<SearchOperationListener> searchOperationListener,
@@ -346,7 +346,7 @@ public IndexShard(
346346
this.indexSortSupplier = indexSortSupplier;
347347
this.indexEventListener = indexEventListener;
348348
this.threadPool = threadPool;
349-
this.threadPoolMergeQueue = threadPoolMergeQueue;
349+
this.threadPoolMergeExecutorService = threadPoolMergeExecutorService;
350350
this.mapperService = mapperService;
351351
this.indexCache = indexCache;
352352
this.internalIndexingStats = new InternalIndexingStats();
@@ -3550,7 +3550,7 @@ private EngineConfig newEngineConfig(LongSupplier globalCheckpointSupplier) {
35503550
return new EngineConfig(
35513551
shardId,
35523552
threadPool,
3553-
threadPoolMergeQueue,
3553+
threadPoolMergeExecutorService,
35543554
indexSettings,
35553555
warmer,
35563556
store,

‎server/src/main/java/org/elasticsearch/indices/IndicesService.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
import org.elasticsearch.index.engine.InternalEngineFactory;
9898
import org.elasticsearch.index.engine.NoOpEngine;
9999
import org.elasticsearch.index.engine.ReadOnlyEngine;
100-
import org.elasticsearch.index.engine.ThreadPoolMergeQueue;
100+
import org.elasticsearch.index.engine.ThreadPoolMergeExecutorService;
101101
import org.elasticsearch.index.fielddata.IndexFieldDataCache;
102102
import org.elasticsearch.index.flush.FlushStats;
103103
import org.elasticsearch.index.get.GetStats;
@@ -232,7 +232,7 @@ public class IndicesService extends AbstractLifecycleComponent
232232
private final CacheCleaner cacheCleaner;
233233
private final ThreadPool threadPool;
234234
@Nullable
235-
private final ThreadPoolMergeQueue threadPoolMergeQueue;
235+
private final ThreadPoolMergeExecutorService threadPoolMergeExecutorService;
236236
private final CircuitBreakerService circuitBreakerService;
237237
private final BigArrays bigArrays;
238238
private final ScriptService scriptService;
@@ -287,7 +287,7 @@ protected void doStart() {
287287
IndicesService(IndicesServiceBuilder builder) {
288288
this.settings = builder.settings;
289289
this.threadPool = builder.threadPool;
290-
this.threadPoolMergeQueue = ThreadPoolMergeQueue.maybeCreateThreadPoolMergeQueue(threadPool, settings);
290+
this.threadPoolMergeExecutorService = ThreadPoolMergeExecutorService.maybeCreateThreadPoolMergeQueue(threadPool, settings);
291291
this.pluginsService = builder.pluginsService;
292292
this.nodeEnv = builder.nodeEnv;
293293
this.parserConfig = XContentParserConfiguration.EMPTY.withDeprecationHandler(LoggingDeprecationHandler.INSTANCE)
@@ -782,7 +782,7 @@ private synchronized IndexService createIndexService(
782782
circuitBreakerService,
783783
bigArrays,
784784
threadPool,
785-
threadPoolMergeQueue,
785+
threadPoolMergeExecutorService,
786786
scriptService,
787787
clusterService,
788788
client,
@@ -1910,7 +1910,7 @@ public BigArrays getBigArrays() {
19101910
}
19111911

19121912
@Nullable
1913-
public ThreadPoolMergeQueue getThreadPoolMergeQueue() {
1914-
return threadPoolMergeQueue;
1913+
public ThreadPoolMergeExecutorService getThreadPoolMergeQueue() {
1914+
return threadPoolMergeExecutorService;
19151915
}
19161916
}

‎server/src/test/java/org/elasticsearch/index/IndexModuleTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import org.elasticsearch.index.engine.EngineTestCase;
6060
import org.elasticsearch.index.engine.InternalEngine;
6161
import org.elasticsearch.index.engine.InternalEngineFactory;
62-
import org.elasticsearch.index.engine.ThreadPoolMergeQueue;
62+
import org.elasticsearch.index.engine.ThreadPoolMergeExecutorService;
6363
import org.elasticsearch.index.fielddata.IndexFieldDataCache;
6464
import org.elasticsearch.index.mapper.MapperMetrics;
6565
import org.elasticsearch.index.mapper.MapperRegistry;
@@ -159,7 +159,7 @@ public void beforeShardFoldersDeleted(ShardId shardId, IndexSettings indexSettin
159159
};
160160
private MapperRegistry mapperRegistry;
161161
private ThreadPool threadPool;
162-
private ThreadPoolMergeQueue threadPoolMergeQueue;
162+
private ThreadPoolMergeExecutorService threadPoolMergeExecutorService;
163163
private CircuitBreakerService circuitBreakerService;
164164
private BigArrays bigArrays;
165165
private ScriptService scriptService;
@@ -190,7 +190,7 @@ public void setUp() throws Exception {
190190
emptyMap()
191191
);
192192
threadPool = new TestThreadPool("test");
193-
threadPoolMergeQueue = ThreadPoolMergeQueue.maybeCreateThreadPoolMergeQueue(threadPool, settings);
193+
threadPoolMergeExecutorService = ThreadPoolMergeExecutorService.maybeCreateThreadPoolMergeQueue(threadPool, settings);
194194
circuitBreakerService = new NoneCircuitBreakerService();
195195
PageCacheRecycler pageCacheRecycler = new PageCacheRecycler(settings);
196196
bigArrays = new BigArrays(pageCacheRecycler, circuitBreakerService, CircuitBreaker.REQUEST);
@@ -217,7 +217,7 @@ private IndexService newIndexService(IndexModule module) throws IOException {
217217
circuitBreakerService,
218218
bigArrays,
219219
threadPool,
220-
threadPoolMergeQueue,
220+
threadPoolMergeExecutorService,
221221
scriptService,
222222
clusterService,
223223
null,

‎server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3587,7 +3587,7 @@ public void testRecoverFromForeignTranslog() throws IOException {
35873587
EngineConfig brokenConfig = new EngineConfig(
35883588
shardId,
35893589
threadPool,
3590-
threadPoolMergeQueue,
3590+
threadPoolMergeExecutorService,
35913591
config.getIndexSettings(),
35923592
null,
35933593
store,

0 commit comments

Comments
 (0)