Skip to content

Commit 679aa94

Browse files
committed
Use internal connection manager when fetching remote node info
This reverts commit 4975b57. This reverts commit ca2c228. Closes #33128
1 parent 3693c1d commit 679aa94

File tree

3 files changed

+7
-20
lines changed
  • qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster
  • server/src/main/java/org/elasticsearch/transport
  • x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster

3 files changed

+7
-20
lines changed

qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
"Fetch remote cluster info for existing cluster":
3-
- skip:
4-
version: "all"
5-
reason: https://github.com/elastic/elasticsearch/issues/33128
3+
64
- do:
75
cluster.remote_info: {}
86
- match: { my_remote_cluster.connected: true }
@@ -13,9 +11,6 @@
1311

1412
---
1513
"Add transient remote cluster based on the preset cluster and check remote info":
16-
- skip:
17-
version: "all"
18-
reason: https://github.com/elastic/elasticsearch/issues/33128
1914
- do:
2015
cluster.get_settings:
2116
include_defaults: true
@@ -70,11 +65,8 @@
7065
---
7166
"skip_unavailable is returned as part of _remote/info response":
7267
- skip:
73-
version: "all"
74-
reason: https://github.com/elastic/elasticsearch/issues/33128
75-
#- skip:
76-
# version: " - 6.0.99"
77-
# reason: "skip_unavailable is only returned from 6.1.0 on"
68+
version: " - 6.0.99"
69+
reason: "skip_unavailable is only returned from 6.1.0 on"
7870

7971
- do:
8072
cluster.get_settings:

server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -686,8 +686,9 @@ public void getConnectionInfo(ActionListener<RemoteConnectionInfo> listener) {
686686
NodesInfoRequest request = new NodesInfoRequest();
687687
request.clear();
688688
request.http(true);
689-
690-
transportService.sendRequest(anyNode.get(), NodesInfoAction.NAME, request, new TransportResponseHandler<NodesInfoResponse>() {
689+
Transport.Connection connection = connectionManager.getConnection(anyNode.get());
690+
transportService.sendRequest(connection, NodesInfoAction.NAME, request, TransportRequestOptions.EMPTY,
691+
new TransportResponseHandler<NodesInfoResponse>() {
691692
@Override
692693
public NodesInfoResponse newInstance() {
693694
return new NodesInfoResponse();

x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ teardown:
3333
ignore: 404
3434
---
3535
"Fetch remote cluster info for existing cluster":
36-
- skip:
37-
version: "all"
38-
reason: https://github.com/elastic/elasticsearch/issues/33128
3936

4037
- do:
4138
headers: { Authorization: "Basic am9lOnMza3JpdA==" }
@@ -49,10 +46,6 @@ teardown:
4946

5047
---
5148
"Add transient remote cluster based on the preset cluster and check remote info":
52-
- skip:
53-
version: "all"
54-
reason: https://github.com/elastic/elasticsearch/issues/33128
55-
5649
- do:
5750
cluster.get_settings:
5851
include_defaults: true
@@ -94,3 +87,4 @@ teardown:
9487

9588
- match: { my_remote_cluster.initial_connect_timeout: "30s" }
9689
- match: { test_remote_cluster.initial_connect_timeout: "30s" }
90+

0 commit comments

Comments
 (0)