separate setting method and remove executor wrapping

gradle/verification-metadata.xml

@@ -2746,122 +2746,170 @@
  </component>
  <component group="org.apache.lucene" name="lucene-analysis-common" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-analysis-common-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="689babfc47c168241418dd71f9ca33483b3b3c45927aba90544ad2c17def6145" origin="Generated by Gradle"/>
+ <sha256 value="689babfc47c168241418dd71f9ca33483b3b3c45927aba90544ad2c17def6145" origin="Generated by Gradle">
+ <also-trust value="834dbad43dcee469605bbcf3cd9cda2a560932ec0126f9a3855b37ab21fa4c4f"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-analysis-icu" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-analysis-icu-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="1ae495ac85ed02b92a212139c17ec1477d51eef729b45ef0c518eb328435d685" origin="Generated by Gradle"/>
+ <sha256 value="1ae495ac85ed02b92a212139c17ec1477d51eef729b45ef0c518eb328435d685" origin="Generated by Gradle">
+ <also-trust value="94aec3c52336e52e292f70972c5aced74bd9b50b71165c5d4945b841ea2e1039"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-analysis-kuromoji-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="41a5bf53c3a7fc385febd67d58a853e860502c29ca63088944562ab7b77c0674" origin="Generated by Gradle"/>
+ <sha256 value="41a5bf53c3a7fc385febd67d58a853e860502c29ca63088944562ab7b77c0674" origin="Generated by Gradle">
+ <also-trust value="814932fcc2e0ca4ab2116995899f8225f1ac4e48cc9476708c5e452b735f7879"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-analysis-morfologik-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="38e475d4d157a1e1961e18a0d43f013cdd6bac7e0eadd68d427f9b6e5b146744" origin="Generated by Gradle"/>
+ <sha256 value="38e475d4d157a1e1961e18a0d43f013cdd6bac7e0eadd68d427f9b6e5b146744" origin="Generated by Gradle">
+ <also-trust value="3f2fca517ab97c0480672e6ff50c55f913136e74dd2fde21252734ed5f09fd4c"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-analysis-nori" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-analysis-nori-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="559bbed9229f0c7a3c2210fdea81ee18e2eb7c7226ad2676f5e91acb34507570" origin="Generated by Gradle"/>
+ <sha256 value="559bbed9229f0c7a3c2210fdea81ee18e2eb7c7226ad2676f5e91acb34507570" origin="Generated by Gradle">
+ <also-trust value="87071498e0cbda220af5f6cd9b4de557421ec94e6b4beb0e3ee858973f1e8c96"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-analysis-phonetic-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="b7e05bd40e20f4d967fae4b2a181f634f55b12ceaf0fb966f66dcfd3edb4d3ce" origin="Generated by Gradle"/>
+ <sha256 value="b7e05bd40e20f4d967fae4b2a181f634f55b12ceaf0fb966f66dcfd3edb4d3ce" origin="Generated by Gradle">
+ <also-trust value="d88a1b679790f9321d468d1d857a29197ded4a8c668c7865dfc072e2bd31d05c"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-analysis-smartcn-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="d61e65c81c818eda32c2daa53f84bb75caf5a2bc85f23e62f4c1005ec952ee4e" origin="Generated by Gradle"/>
+ <sha256 value="d61e65c81c818eda32c2daa53f84bb75caf5a2bc85f23e62f4c1005ec952ee4e" origin="Generated by Gradle">
+ <also-trust value="908fd65f58202514aa8307af629af283969b8c78b465920ff97f17c4dfe0ebe3"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-analysis-stempel-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="6c06e24c6e8edb3e951f8566400f7efbe8a29df949420265dc6f5505ace48247" origin="Generated by Gradle"/>
+ <sha256 value="6c06e24c6e8edb3e951f8566400f7efbe8a29df949420265dc6f5505ace48247" origin="Generated by Gradle">
+ <also-trust value="ee8e933373a15b4d218fd4781d5ca48760b227c4b4262d1d57230ec20dcde4b4"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-backward-codecs" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-backward-codecs-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="a73f6f1a3c9c96c941b7c1aa262f7502a52cadfd1b86d22da0555b4243ab04b8" origin="Generated by Gradle"/>
+ <sha256 value="a73f6f1a3c9c96c941b7c1aa262f7502a52cadfd1b86d22da0555b4243ab04b8" origin="Generated by Gradle">
+ <also-trust value="55d53398da89592f99578e9ef6174203e720c23270099c5bf7bb6f58f46d2b40"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-codecs" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-codecs-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="2ed345e95928b260f34d215f36cb763d9fd1eb0f980a4581f1c52f3b318ef209" origin="Generated by Gradle"/>
+ <sha256 value="2ed345e95928b260f34d215f36cb763d9fd1eb0f980a4581f1c52f3b318ef209" origin="Generated by Gradle">
+ <also-trust value="6ca3d38fabe0ff28de0c6a93b762b315c96b983bf9163a3d475baf07b54ef563"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-core" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-core-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="df3eacb57c1193cc0d1ab0192fa415409fa5b52492a58ea60c9de233b9c0fa33" origin="Generated by Gradle"/>
+ <sha256 value="df3eacb57c1193cc0d1ab0192fa415409fa5b52492a58ea60c9de233b9c0fa33" origin="Generated by Gradle">
+ <also-trust value="ff5e3f47e09aa0826afde5aebd7c3305d9562e599cfe6643927b031f71b33a2d"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-expressions" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-expressions-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="e80b2d0ea1fe76aa53ee8833a1990870044f68522c9749a514f56e568b685507" origin="Generated by Gradle"/>
+ <sha256 value="e80b2d0ea1fe76aa53ee8833a1990870044f68522c9749a514f56e568b685507" origin="Generated by Gradle">
+ <also-trust value="81e527659ba8aae45e71cc7dde909945007fdbb2c989fa4f9e185a10f28fc9bc"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-grouping" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-grouping-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="b589600e8fc51cf147355f7cea76ced042b5d460d78509cb8a5a8169cff43c48" origin="Generated by Gradle"/>
+ <sha256 value="b589600e8fc51cf147355f7cea76ced042b5d460d78509cb8a5a8169cff43c48" origin="Generated by Gradle">
+ <also-trust value="591c77b3444b7e898fbc35a994a0136172a6066d5940468aafa549242bbc303b"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-highlighter" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-highlighter-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="471c517bcebc1026499d783dd7a99c1ea35e153cb904b000d6805228e0b2ddc9" origin="Generated by Gradle"/>
+ <sha256 value="471c517bcebc1026499d783dd7a99c1ea35e153cb904b000d6805228e0b2ddc9" origin="Generated by Gradle">
+ <also-trust value="59ef71973dbec4d73506941bd7e7993c0b032f07c6dbc928234b2cff12bf9f99"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-join" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-join-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="8a0d3c9f1d7da2152d5e4e69a9275b360ae0d66d27e0b8128fdbaa70397fa004" origin="Generated by Gradle"/>
+ <sha256 value="8a0d3c9f1d7da2152d5e4e69a9275b360ae0d66d27e0b8128fdbaa70397fa004" origin="Generated by Gradle">
+ <also-trust value="b4744d15c8dde1391e9272d79d44da7efb1a4eefc29525da108e0cbf9204a38f"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-memory" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-memory-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="b86cf0702f07ee088eeac9b787ffdab64753291667911e7308d5882a7258a702" origin="Generated by Gradle"/>
+ <sha256 value="b86cf0702f07ee088eeac9b787ffdab64753291667911e7308d5882a7258a702" origin="Generated by Gradle">
+ <also-trust value="4c4aa048a04a8dba6b92e5ff0ae06d2d00ac9e22be19724ff91ec1998f91f807"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-misc" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-misc-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="0b0272b7ec0d87d80cabc1361882ad1e731c9ad68476bb78d5724f7cc897bea6" origin="Generated by Gradle"/>
+ <sha256 value="0b0272b7ec0d87d80cabc1361882ad1e731c9ad68476bb78d5724f7cc897bea6" origin="Generated by Gradle">
+ <also-trust value="0cbf1767319370797ea99687a0cfc018ece9db968299c468e04e24a0ca59b21d"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-queries" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-queries-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="425c7d877d9207ea9c64826c3321ac814ce015166448a80f2771ad921f4a91a0" origin="Generated by Gradle"/>
+ <sha256 value="425c7d877d9207ea9c64826c3321ac814ce015166448a80f2771ad921f4a91a0" origin="Generated by Gradle">
+ <also-trust value="737a88005c11fcb75d6144fa08e9dc90f03c5ea29f399c6d92b834afdf19041d"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-queryparser" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-queryparser-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="b296bae6078bfb83c18d07cd651654e66d08d35ab6a967fd29e6c469cdbc91d7" origin="Generated by Gradle"/>
+ <sha256 value="b296bae6078bfb83c18d07cd651654e66d08d35ab6a967fd29e6c469cdbc91d7" origin="Generated by Gradle">
+ <also-trust value="0c8342b44c82f025e75d474c5095653ce6876f91ee4fb811b3339dcf1743c352"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-sandbox" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-sandbox-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="0d88b1132f083ca7f5dd83e0ee54167bafb13e27eff64add9bd322ae26e49f8c" origin="Generated by Gradle"/>
+ <sha256 value="0d88b1132f083ca7f5dd83e0ee54167bafb13e27eff64add9bd322ae26e49f8c" origin="Generated by Gradle">
+ <also-trust value="4517c0e49c3790910e250c5a8f8a8ba27e58d19a10b70ba0af653e31b0f43952"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-spatial-extras" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-spatial-extras-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="c7c3fe9efc0a76587e13041fa382a470605a3b383195792256af6895290fc9af" origin="Generated by Gradle"/>
+ <sha256 value="c7c3fe9efc0a76587e13041fa382a470605a3b383195792256af6895290fc9af" origin="Generated by Gradle">
+ <also-trust value="bf6da05687342735f9548f1440331eb714243cf70e4167ffd54520c1eebeb031"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-spatial3d" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-spatial3d-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="e54570265d809eaacf57be4be50b6342de6ac999d0d6889ca971b101fb673200" origin="Generated by Gradle"/>
+ <sha256 value="e54570265d809eaacf57be4be50b6342de6ac999d0d6889ca971b101fb673200" origin="Generated by Gradle">
+ <also-trust value="df70a46826a7ce06cca1744c73fb14a211270daeec3b2f6493b39af4bd205d0b"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-suggest" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-suggest-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="872bb6f45c075ce3da74d8e0d1ac7d76dc10a9017aaaf609124aa92e3960f9d0" origin="Generated by Gradle"/>
+ <sha256 value="872bb6f45c075ce3da74d8e0d1ac7d76dc10a9017aaaf609124aa92e3960f9d0" origin="Generated by Gradle">
+ <also-trust value="ed688637fb4641c1387e6b3f3c20e316c79cf1730ce7e62994320ddfe8e837aa"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.lucene" name="lucene-test-framework" version="9.12.0-snapshot-7edd64614c5">
  <artifact name="lucene-test-framework-9.12.0-snapshot-7edd64614c5.jar">
- <sha256 value="6b36b2187b9296dc09eda6ec84ac472213906850ef665bde5eccebcd65a07795" origin="Generated by Gradle"/>
+ <sha256 value="6b36b2187b9296dc09eda6ec84ac472213906850ef665bde5eccebcd65a07795" origin="Generated by Gradle">
+ <also-trust value="a4648899b71fd029ba3aff75a7038b0b1250001f494e83b9c3542821832ef02a"/>
+ </sha256>
  </artifact>
  </component>
  <component group="org.apache.maven" name="maven-artifact" version="3.6.1">

server/src/main/java/org/elasticsearch/node/NodeConstruction.java

@@ -85,6 +85,7 @@
 import org.elasticsearch.core.IOUtils;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.core.Tuple;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.discovery.DiscoveryModule;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.env.NodeEnvironment;
@@ -497,13 +498,7 @@ private SettingsModule validateSettings(Settings envSettings, Settings settings,
  for (final ExecutorBuilder<?> builder : threadPool.builders()) {
  additionalSettings.addAll(builder.getRegisteredSettings());
  }
- // TODO remove the below settings, they are unused and only here to enable BwC for deployments that still use them
- additionalSettings.add(
- Setting.intSetting("thread_pool.search_worker.queue_size", 0, Setting.Property.NodeScope, Setting.Property.DeprecatedWarning)
- );
- additionalSettings.add(
- Setting.intSetting("thread_pool.search_worker.size", 0, Setting.Property.NodeScope, Setting.Property.DeprecatedWarning)
- );
+ addBwcSearchWorkerSettings(additionalSettings);
  SettingsExtension.load().forEach(e -> additionalSettings.addAll(e.getSettings()));
 
  // this is as early as we can validate settings at this point. we already pass them to ThreadPool
@@ -534,6 +529,17 @@ private SettingsModule validateSettings(Settings envSettings, Settings settings,
  return settingsModule;
  }
 
+ @UpdateForV9
+ private static void addBwcSearchWorkerSettings(List<Setting<?>> additionalSettings) {
+ // TODO remove the below settings, they are unused and only here to enable BwC for deployments that still use them
+ additionalSettings.add(
+ Setting.intSetting("thread_pool.search_worker.queue_size", 0, Setting.Property.NodeScope, Setting.Property.DeprecatedWarning)
+ );
+ additionalSettings.add(
+ Setting.intSetting("thread_pool.search_worker.size", 0, Setting.Property.NodeScope, Setting.Property.DeprecatedWarning)
+ );
+ }
+
  private SearchModule createSearchModule(Settings settings, ThreadPool threadPool, TelemetryProvider telemetryProvider) {
  IndexSearcher.setMaxClauseCount(SearchUtils.calculateMaxClauseValue(threadPool));
  return new SearchModule(settings, pluginsService.filterPlugins(SearchPlugin.class).toList(), telemetryProvider);

server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java

@@ -55,7 +55,6 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;
-import java.util.concurrent.RejectedExecutionException;
 
 /**
  * Context-aware extension of {@link IndexSearcher}.
@@ -132,18 +131,7 @@ public ContextIndexSearcher(
  int maximumNumberOfSlices,
  int minimumDocsPerSlice
  ) throws IOException {
- super(
- wrapWithExitableDirectoryReader ? new ExitableDirectoryReader((DirectoryReader) reader, cancellable) : reader,
- executor == null ? null : r -> {
- try {
- executor.execute(r);
- } catch (RejectedExecutionException ignored) {
- // in case of rejection run on the current thread without forking, we don't want failures in the Lucene search in the
- // unlikely case of running into a full queue on the executor side
- r.run();
- }
- }
- );
+ super(wrapWithExitableDirectoryReader ? new ExitableDirectoryReader((DirectoryReader) reader, cancellable) : reader, executor);
  setSimilarity(similarity);
  setQueryCache(queryCache);
  setQueryCachingPolicy(queryCachingPolicy);