Skip to content

Commit 79ca6d7

Browse files
Remove RemoteClusterService.getConnections() method
This method is only used in unit tests. In an effort to reduce the API surface area and ease the analysis for making RemoteClusterService multi-project aware, this change refactors the test code to use other existing methods to achieve the same functionality. Relates: ES-11576
1 parent bec9749 commit 79ca6d7

File tree

3 files changed

+23
-19
lines changed

3 files changed

+23
-19
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import java.io.Closeable;
4141
import java.io.IOException;
4242
import java.util.Arrays;
43-
import java.util.Collection;
4443
import java.util.HashMap;
4544
import java.util.Iterator;
4645
import java.util.List;
@@ -653,10 +652,6 @@ public RemoteClusterClient getRemoteClusterClient(
653652
});
654653
}
655654

656-
Collection<RemoteClusterConnection> getConnections() {
657-
return remoteClusters.values();
658-
}
659-
660655
static void registerRemoteClusterHandshakeRequestHandler(TransportService transportService) {
661656
transportService.registerRequestHandler(
662657
REMOTE_CLUSTER_HANDSHAKE_ACTION_NAME,

server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -838,14 +838,18 @@ public void testCCSRemoteReduceWithDisconnectedRemoteClusters() throws Exception
838838
}
839839

840840
CountDownLatch disconnectedLatch = new CountDownLatch(numDisconnectedClusters);
841-
RemoteClusterServiceTests.addConnectionListener(remoteClusterService, new TransportConnectionListener() {
842-
@Override
843-
public void onNodeDisconnected(DiscoveryNode node, @Nullable Exception closeException) {
844-
if (disconnectedNodes.remove(node)) {
845-
disconnectedLatch.countDown();
841+
RemoteClusterServiceTests.addConnectionListener(
842+
remoteClusterService,
843+
remoteIndicesByCluster.keySet(),
844+
new TransportConnectionListener() {
845+
@Override
846+
public void onNodeDisconnected(DiscoveryNode node, @Nullable Exception closeException) {
847+
if (disconnectedNodes.remove(node)) {
848+
disconnectedLatch.countDown();
849+
}
846850
}
847851
}
848-
});
852+
);
849853
for (DiscoveryNode disconnectedNode : disconnectedNodes) {
850854
service.addFailToSendNoConnectRule(disconnectedNode.getAddress());
851855
}
@@ -1149,14 +1153,18 @@ public void testCollectSearchShards() throws Exception {
11491153
}
11501154

11511155
CountDownLatch disconnectedLatch = new CountDownLatch(numDisconnectedClusters);
1152-
RemoteClusterServiceTests.addConnectionListener(remoteClusterService, new TransportConnectionListener() {
1153-
@Override
1154-
public void onNodeDisconnected(DiscoveryNode node, @Nullable Exception closeException) {
1155-
if (disconnectedNodes.remove(node)) {
1156-
disconnectedLatch.countDown();
1156+
RemoteClusterServiceTests.addConnectionListener(
1157+
remoteClusterService,
1158+
remoteIndicesByCluster.keySet(),
1159+
new TransportConnectionListener() {
1160+
@Override
1161+
public void onNodeDisconnected(DiscoveryNode node, @Nullable Exception closeException) {
1162+
if (disconnectedNodes.remove(node)) {
1163+
disconnectedLatch.countDown();
1164+
}
11571165
}
11581166
}
1159-
});
1167+
);
11601168
for (DiscoveryNode disconnectedNode : disconnectedNodes) {
11611169
service.addFailToSendNoConnectRule(disconnectedNode.getAddress());
11621170
}

server/src/test/java/org/elasticsearch/transport/RemoteClusterServiceTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,8 +1250,9 @@ public static void updateSkipUnavailable(RemoteClusterService service, String cl
12501250
connection.setSkipUnavailable(skipUnavailable);
12511251
}
12521252

1253-
public static void addConnectionListener(RemoteClusterService service, TransportConnectionListener listener) {
1254-
for (RemoteClusterConnection connection : service.getConnections()) {
1253+
public static void addConnectionListener(RemoteClusterService service, Set<String> clusterAliases, TransportConnectionListener listener) {
1254+
for (final var clusterAlias : clusterAliases) {
1255+
final var connection = service.getRemoteClusterConnection(clusterAlias);
12551256
ConnectionManager connectionManager = connection.getConnectionManager();
12561257
connectionManager.addListener(listener);
12571258
}

0 commit comments

Comments
 (0)