diff --git a/muted-tests.yml b/muted-tests.yml index f0458b372c1cd..e34ffd493ea58 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -455,9 +455,6 @@ tests: - class: org.elasticsearch.xpack.esql.ccq.MultiClustersIT method: testLookupJoinAliasesSkipOld issue: https://github.com/elastic/elasticsearch/issues/131697 -- class: org.elasticsearch.indices.cluster.RemoteSearchForceConnectTimeoutIT - method: testTimeoutSetting - issue: https://github.com/elastic/elasticsearch/issues/131656 - class: org.elasticsearch.packaging.test.DockerTests method: test151MachineDependentHeapWithSizeOverride issue: https://github.com/elastic/elasticsearch/issues/123437 @@ -473,9 +470,6 @@ tests: - class: org.elasticsearch.index.engine.MergeWithLowDiskSpaceIT method: testRelocationWhileForceMerging issue: https://github.com/elastic/elasticsearch/issues/131789 -- class: org.elasticsearch.indices.cluster.FieldCapsForceConnectTimeoutIT - method: testTimeoutSetting - issue: https://github.com/elastic/elasticsearch/issues/132179 - class: org.elasticsearch.test.rest.yaml.MDPYamlTestSuiteIT method: test {yaml=mdp/10_basic/Index using shared data path} issue: https://github.com/elastic/elasticsearch/issues/132223 diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/FieldCapsForceConnectTimeoutIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/FieldCapsForceConnectTimeoutIT.java index 96d2b4190f75d..07474968e2f94 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/FieldCapsForceConnectTimeoutIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/FieldCapsForceConnectTimeoutIT.java @@ -73,12 +73,14 @@ protected Map skipUnavailableForRemoteClusters() { public void testTimeoutSetting() { var latch = new CountDownLatch(1); - for (String nodeName : cluster(LOCAL_CLUSTER).getNodeNames()) { - MockTransportService mts = (MockTransportService) cluster(LOCAL_CLUSTER).getInstance(TransportService.class, nodeName); - - mts.addConnectBehavior( - cluster(LINKED_CLUSTER_1).getInstance(TransportService.class, (String) null), - ((transport, discoveryNode, profile, listener) -> { + for (String localNodeName : cluster(LOCAL_CLUSTER).getNodeNames()) { + MockTransportService localMts = (MockTransportService) cluster(LOCAL_CLUSTER).getInstance( + TransportService.class, + localNodeName + ); + for (String remoteNodeName : cluster(LINKED_CLUSTER_1).getNodeNames()) { + TransportService remoteTs = cluster(LINKED_CLUSTER_1).getInstance(TransportService.class, remoteNodeName); + localMts.addConnectBehavior(remoteTs, ((transport, discoveryNode, profile, listener) -> { try { latch.await(); } catch (InterruptedException e) { @@ -86,8 +88,8 @@ public void testTimeoutSetting() { } transport.openConnection(discoveryNode, profile, listener); - }) - ); + })); + } } // Add some dummy data to prove we are communicating fine with the remote. diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/RemoteSearchForceConnectTimeoutIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/RemoteSearchForceConnectTimeoutIT.java index 5dd200f2b4ce9..7b6b0190d682e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/RemoteSearchForceConnectTimeoutIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/RemoteSearchForceConnectTimeoutIT.java @@ -70,12 +70,14 @@ protected Map skipUnavailableForRemoteClusters() { public void testTimeoutSetting() { var latch = new CountDownLatch(1); - for (String nodeName : cluster(LOCAL_CLUSTER).getNodeNames()) { - MockTransportService mts = (MockTransportService) cluster(LOCAL_CLUSTER).getInstance(TransportService.class, nodeName); - - mts.addConnectBehavior( - cluster(REMOTE_CLUSTER_1).getInstance(TransportService.class, (String) null), - ((transport, discoveryNode, profile, listener) -> { + for (String localNodeName : cluster(LOCAL_CLUSTER).getNodeNames()) { + MockTransportService localMts = (MockTransportService) cluster(LOCAL_CLUSTER).getInstance( + TransportService.class, + localNodeName + ); + for (String remoteNodeName : cluster(REMOTE_CLUSTER_1).getNodeNames()) { + TransportService remoteTs = cluster(REMOTE_CLUSTER_1).getInstance(TransportService.class, remoteNodeName); + localMts.addConnectBehavior(remoteTs, ((transport, discoveryNode, profile, listener) -> { try { latch.await(); } catch (InterruptedException e) { @@ -83,8 +85,8 @@ public void testTimeoutSetting() { } transport.openConnection(discoveryNode, profile, listener); - }) - ); + })); + } } // Add some dummy data to prove we are communicating fine with the remote.