Apache Solr open-source search software
SOLR-13350: multi-threaded search: default to 'available processors' thread count (#2569)
Christine Poerschkeffde4199a094
diff --git a/solr/bin/solr b/solr/bin/solrindex ac6c4330b79..c9994af05cb 100755--- a/solr/bin/solr+++ b/solr/bin/solr@@ -1446,9 +1446,6 @@ if [ $# -gt 0 ]; thendonefi-# Setting number of threads for search-if ! command -v nproc &> /dev/null; then echo "Couldn't determine number of CPUs, using default number of search threads"; else cpus=`nproc`; SCRIPT_SOLR_OPTS+="-Dsolr.searchThreads=$cpus"; fi-# Default placement pluginif [[ -n "${SOLR_PLACEMENTPLUGIN_DEFAULT:-}" ]] ; thenSCRIPT_SOLR_OPTS+=("-Dsolr.placementplugin.default=$SOLR_PLACEMENTPLUGIN_DEFAULT")diff --git a/solr/core/src/java/org/apache/solr/core/NodeConfig.java b/solr/core/src/java/org/apache/solr/core/NodeConfig.javaindex 2b18f6983c3..dbc44336484 100644--- a/solr/core/src/java/org/apache/solr/core/NodeConfig.java+++ b/solr/core/src/java/org/apache/solr/core/NodeConfig.java@@ -627,7 +627,9 @@ public class NodeConfig {// No:of core load threads in cloud mode is set to a default of 8public static final int DEFAULT_CORE_LOAD_THREADS_IN_CLOUD = 8;- public static final int DEFAULT_INDEX_SEARCHER_EXECUTOR_THREADS = 4;+ public static final int DEFAULT_INDEX_SEARCHER_EXECUTOR_THREADS =+ Runtime.getRuntime().availableProcessors();+ ;private static final String DEFAULT_CORESLOCATORCLASS ="org.apache.solr.core.CorePropertiesLocator";diff --git a/solr/server/solr/solr.xml b/solr/server/solr/solr.xmlindex 4fd60dd6823..bf364331214 100644--- a/solr/server/solr/solr.xml+++ b/solr/server/solr/solr.xml@@ -34,7 +34,6 @@<str name="allowPaths">${solr.allowPaths:}</str><str name="allowUrls">${solr.allowUrls:}</str><str name="hideStackTrace">${solr.hideStackTrace:false}</str>- <int name="indexSearcherExecutorThreads">${solr.searchThreads:4}</int><solrcloud>diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adocindex b999a8fb82e..3f865cf4100 100644--- a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc@@ -182,7 +182,7 @@ The default value is equal to the number of processors.+[%autowidth,frame=none]|===-|Optional |Default: 4+|Optional |Default: number of available processors|===+Specifies the number of threads that will be assigned for search queries.