SOLR-13350: multi-threaded search: replace cached with fixed threadpo…

…ol (#2508)
apache · Jul 23, 2024 · dfdbf85 · dfdbf85
1 parent 06950c6
commit dfdbf85
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -445,7 +445,7 @@ public CoreContainer(NodeConfig config, CoresLocator locator, boolean asyncSolrC
     final int indexSearcherExecutorThreads = cfg.getIndexSearcherExecutorThreads();
     if (0 < indexSearcherExecutorThreads) {
       this.collectorExecutor =
-          ExecutorUtil.newMDCAwareCachedThreadPool(
+          ExecutorUtil.newMDCAwareFixedThreadPool(
               indexSearcherExecutorThreads, // thread count
               indexSearcherExecutorThreads * 1000, // queue size
               new SolrNamedThreadFactory("searcherCollector"));

diff --git a/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java
@@ -201,6 +201,17 @@ public static ExecutorService newMDCAwareFixedThreadPool(
         nThreads, nThreads, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), threadFactory);
   }
 
+  public static ExecutorService newMDCAwareFixedThreadPool(
+      int nThreads, int queueCapacity, ThreadFactory threadFactory) {
+    return new MDCAwareThreadPoolExecutor(
+        nThreads,
+        nThreads,
+        0L,
+        TimeUnit.MILLISECONDS,
+        new LinkedBlockingQueue<>(queueCapacity),
+        threadFactory);
+  }
+
   /**
    * See {@link java.util.concurrent.Executors#newSingleThreadExecutor(ThreadFactory)}. Note the
    * thread is always active, even if no tasks are submitted to the executor.