Przeglądaj źródła

Passing correct executor (#111305)

With https://github.com/elastic/elasticsearch/pull/100895 we changed the
executor for TransporActions to be explicitly passed; while changing
`TransportYieldsContinuationsAction` used in
`Netty4ChunkedContinuationsIT`, I passed down the direct executor by
mistake, which broke the continuation tests.

Closes #111283
Lorenzo Dematté 1 rok temu
rodzic
commit
4880205eee

+ 1 - 1
modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/http/netty4/Netty4ChunkedContinuationsIT.java

@@ -435,7 +435,7 @@ public class Netty4ChunkedContinuationsIT extends ESNetty4IntegTestCase {
 
             @Inject
             public TransportYieldsContinuationsAction(ActionFilters actionFilters, TransportService transportService) {
-                this(actionFilters, transportService, EsExecutors.DIRECT_EXECUTOR_SERVICE);
+                this(actionFilters, transportService, transportService.getThreadPool().executor(ThreadPool.Names.GENERIC));
             }
 
             TransportYieldsContinuationsAction(ActionFilters actionFilters, TransportService transportService, ExecutorService executor) {

+ 0 - 3
muted-tests.yml

@@ -117,9 +117,6 @@ tests:
 - class: org.elasticsearch.action.admin.indices.create.SplitIndexIT
   method: testSplitIndexPrimaryTerm
   issue: https://github.com/elastic/elasticsearch/issues/111282
-- class: org.elasticsearch.http.netty4.Netty4ChunkedContinuationsIT
-  method: testContinuationFailure
-  issue: https://github.com/elastic/elasticsearch/issues/111283
 - class: org.elasticsearch.upgrades.LogsIndexModeFullClusterRestartIT
   method: testLogsIndexing {cluster=UPGRADED}
   issue: https://github.com/elastic/elasticsearch/issues/111306