Skip to content

Commit 458cbb4

Browse files
JeremyDahlgrenJeremyDahlgren
committed
Reorder params, make isRemoteNodeConnected() public
1 parent 1b82079 commit 458cbb4

File tree

2 files changed

+37
-40
lines changed

2 files changed

+37
-40
lines changed

‎server/src/test/java/org/elasticsearch/transport/RemoteClusterClientTests.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import static org.elasticsearch.test.NodeRoles.removeRoles;
4141
import static org.elasticsearch.transport.AbstractSimpleTransportTestCase.IGNORE_DESERIALIZATION_ERRORS_SETTING;
4242
import static org.elasticsearch.transport.RemoteClusterConnectionTests.startTransport;
43+
import static org.elasticsearch.transport.RemoteClusterServiceTests.isRemoteNodeConnected;
4344
import static org.hamcrest.Matchers.equalTo;
4445
import static org.hamcrest.Matchers.instanceOf;
4546

@@ -95,7 +96,7 @@ public void testConnectAndExecuteRequest() throws Exception {
9596
service.acceptIncomingRequests();
9697
logger.info("now accepting incoming requests on local transport");
9798
RemoteClusterService remoteClusterService = service.getRemoteClusterService();
98-
assertTrue(isRemoteNodeConnected("test", remoteNode, remoteClusterService));
99+
assertTrue(isRemoteNodeConnected(remoteClusterService, "test", remoteNode));
99100
var client = remoteClusterService.getRemoteClusterClient(
100101
"test",
101102
threadPool.executor(TEST_THREAD_POOL_NAME),
@@ -172,7 +173,7 @@ public void testEnsureWeReconnect() throws Exception {
172173
// the right calls in place in the RemoteAwareClient
173174
service.acceptIncomingRequests();
174175
RemoteClusterService remoteClusterService = service.getRemoteClusterService();
175-
assertBusy(() -> assertTrue(isRemoteNodeConnected("test", remoteNode, remoteClusterService)));
176+
assertBusy(() -> assertTrue(isRemoteNodeConnected(remoteClusterService, "test", remoteNode)));
176177
for (int i = 0; i < 10; i++) {
177178
RemoteClusterConnection remoteClusterConnection = remoteClusterService.getRemoteClusterConnection("test");
178179
assertBusy(remoteClusterConnection::assertNoRunningConnections);
@@ -286,7 +287,7 @@ public void testQuicklySkipUnavailableClusters() throws Exception {
286287
);
287288

288289
try {
289-
assertFalse(isRemoteNodeConnected("test", remoteNode, remoteClusterService));
290+
assertFalse(isRemoteNodeConnected(remoteClusterService, "test", remoteNode));
290291

291292
// check that we quickly fail
292293
if (randomBoolean()) {
@@ -325,12 +326,8 @@ public void testQuicklySkipUnavailableClusters() throws Exception {
325326
() -> safeAwait(listener -> client.getConnection(null, listener.map(v -> v)))
326327
)
327328
);
328-
assertTrue(isRemoteNodeConnected("test", remoteNode, remoteClusterService));
329+
assertTrue(isRemoteNodeConnected(remoteClusterService, "test", remoteNode));
329330
}
330331
}
331332
}
332-
333-
private static boolean isRemoteNodeConnected(String clusterName, DiscoveryNode node, RemoteClusterService service) {
334-
return service.getRemoteClusterConnection(clusterName).isNodeConnected(node);
335-
}
336333
}

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ public void testGroupClusterIndices() throws IOException {
165165
assertFalse(hasRegisteredClusters(service));
166166
service.initializeRemoteClusters();
167167
assertTrue(hasRegisteredClusters(service));
168-
assertTrue(isRemoteClusterRegistered("cluster_1", service));
169-
assertTrue(isRemoteClusterRegistered("cluster_2", service));
170-
assertFalse(isRemoteClusterRegistered("foo", service));
168+
assertTrue(isRemoteClusterRegistered(service, "cluster_1"));
169+
assertTrue(isRemoteClusterRegistered(service, "cluster_2"));
170+
assertFalse(isRemoteClusterRegistered(service, "foo"));
171171
{
172172
Map<String, List<String>> perClusterIndices = service.groupClusterIndices(
173173
service.getRegisteredRemoteClusterNames(),
@@ -379,9 +379,9 @@ public void testGroupIndices() throws IOException {
379379
assertFalse(hasRegisteredClusters(service));
380380
service.initializeRemoteClusters();
381381
assertTrue(hasRegisteredClusters(service));
382-
assertTrue(isRemoteClusterRegistered("cluster_1", service));
383-
assertTrue(isRemoteClusterRegistered("cluster_2", service));
384-
assertFalse(isRemoteClusterRegistered("foo", service));
382+
assertTrue(isRemoteClusterRegistered(service, "cluster_1"));
383+
assertTrue(isRemoteClusterRegistered(service, "cluster_2"));
384+
assertFalse(isRemoteClusterRegistered(service, "foo"));
385385
{
386386
Map<String, OriginalIndices> perClusterIndices = service.groupIndices(
387387
IndicesOptions.LENIENT_EXPAND_OPEN,
@@ -503,18 +503,18 @@ public void testIncrementallyAddClusters() throws IOException {
503503
}).start();
504504
clusterAdded.actionGet();
505505
assertTrue(hasRegisteredClusters(service));
506-
assertTrue(isRemoteClusterRegistered("cluster_1", service));
506+
assertTrue(isRemoteClusterRegistered(service, "cluster_1"));
507507
Settings cluster2Settings = createSettings(
508508
"cluster_2",
509509
Collections.singletonList(cluster2Seed.getAddress().toString())
510510
);
511511
service.validateAndUpdateRemoteCluster("cluster_2", cluster2Settings);
512512
assertTrue(hasRegisteredClusters(service));
513-
assertTrue(isRemoteClusterRegistered("cluster_1", service));
514-
assertTrue(isRemoteClusterRegistered("cluster_2", service));
513+
assertTrue(isRemoteClusterRegistered(service, "cluster_1"));
514+
assertTrue(isRemoteClusterRegistered(service, "cluster_2"));
515515
Settings cluster2SettingsDisabled = createSettings("cluster_2", Collections.emptyList());
516516
service.validateAndUpdateRemoteCluster("cluster_2", cluster2SettingsDisabled);
517-
assertFalse(isRemoteClusterRegistered("cluster_2", service));
517+
assertFalse(isRemoteClusterRegistered(service, "cluster_2"));
518518
IllegalArgumentException iae = expectThrows(
519519
IllegalArgumentException.class,
520520
() -> service.validateAndUpdateRemoteCluster(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY, Settings.EMPTY)
@@ -567,7 +567,7 @@ public void testDefaultPingSchedule() throws IOException {
567567
createSettings("cluster_1", Collections.singletonList(seedNode.getAddress().toString()))
568568
);
569569
assertTrue(hasRegisteredClusters(service));
570-
assertTrue(isRemoteClusterRegistered("cluster_1", service));
570+
assertTrue(isRemoteClusterRegistered(service, "cluster_1"));
571571
RemoteClusterConnection remoteClusterConnection = service.getRemoteClusterConnection("cluster_1");
572572
assertEquals(pingSchedule, remoteClusterConnection.getConnectionManager().getConnectionProfile().getPingInterval());
573573
}
@@ -624,7 +624,7 @@ public void testCustomPingSchedule() throws IOException {
624624
builder.put("cluster.remote.cluster_2.transport.ping_schedule", pingSchedule2);
625625
try (RemoteClusterService service = new RemoteClusterService(builder.build(), transportService)) {
626626
service.initializeRemoteClusters();
627-
assertTrue(isRemoteClusterRegistered("cluster_1", service));
627+
assertTrue(isRemoteClusterRegistered(service, "cluster_1"));
628628
RemoteClusterConnection remoteClusterConnection1 = service.getRemoteClusterConnection("cluster_1");
629629
assertEquals(pingSchedule1, remoteClusterConnection1.getConnectionManager().getConnectionProfile().getPingInterval());
630630
RemoteClusterConnection remoteClusterConnection2 = service.getRemoteClusterConnection("cluster_2");
@@ -768,12 +768,12 @@ public void testRemoteNodeAttribute() throws IOException, InterruptedException {
768768
secondLatch.await();
769769

770770
assertTrue(hasRegisteredClusters(service));
771-
assertTrue(isRemoteClusterRegistered("cluster_1", service));
772-
assertFalse(isRemoteNodeConnected("cluster_1", c1N1Node, service));
773-
assertTrue(isRemoteNodeConnected("cluster_1", c1N2Node, service));
774-
assertTrue(isRemoteClusterRegistered("cluster_2", service));
775-
assertFalse(isRemoteNodeConnected("cluster_2", c2N1Node, service));
776-
assertTrue(isRemoteNodeConnected("cluster_2", c2N2Node, service));
771+
assertTrue(isRemoteClusterRegistered(service, "cluster_1"));
772+
assertFalse(isRemoteNodeConnected(service, "cluster_1", c1N1Node));
773+
assertTrue(isRemoteNodeConnected(service, "cluster_1", c1N2Node));
774+
assertTrue(isRemoteClusterRegistered(service, "cluster_2"));
775+
assertFalse(isRemoteNodeConnected(service, "cluster_2", c2N1Node));
776+
assertTrue(isRemoteNodeConnected(service, "cluster_2", c2N2Node));
777777
assertEquals(0, transportService.getConnectionManager().size());
778778
}
779779
}
@@ -858,12 +858,12 @@ public void testRemoteNodeRoles() throws IOException, InterruptedException {
858858
secondLatch.await();
859859

860860
assertTrue(hasRegisteredClusters(service));
861-
assertTrue(isRemoteClusterRegistered("cluster_1", service));
862-
assertFalse(isRemoteNodeConnected("cluster_1", c1N1Node, service));
863-
assertTrue(isRemoteNodeConnected("cluster_1", c1N2Node, service));
864-
assertTrue(isRemoteClusterRegistered("cluster_2", service));
865-
assertFalse(isRemoteNodeConnected("cluster_2", c2N1Node, service));
866-
assertTrue(isRemoteNodeConnected("cluster_2", c2N2Node, service));
861+
assertTrue(isRemoteClusterRegistered(service, "cluster_1"));
862+
assertFalse(isRemoteNodeConnected(service, "cluster_1", c1N1Node));
863+
assertTrue(isRemoteNodeConnected(service, "cluster_1", c1N2Node));
864+
assertTrue(isRemoteClusterRegistered(service, "cluster_2"));
865+
assertFalse(isRemoteNodeConnected(service, "cluster_2", c2N1Node));
866+
assertTrue(isRemoteNodeConnected(service, "cluster_2", c2N2Node));
867867
assertEquals(0, transportService.getConnectionManager().size());
868868
}
869869
}
@@ -1408,17 +1408,17 @@ public void testUseDifferentTransportProfileForCredentialsProtectedRemoteCluster
14081408
secondLatch.await();
14091409

14101410
assertTrue(hasRegisteredClusters(service));
1411-
assertTrue(isRemoteClusterRegistered("cluster_1", service));
1411+
assertTrue(isRemoteClusterRegistered(service, "cluster_1"));
14121412
if (firstRemoteClusterProxyMode) {
1413-
assertFalse(isRemoteNodeConnected("cluster_1", c1Node, service));
1413+
assertFalse(isRemoteNodeConnected(service, "cluster_1", c1Node));
14141414
} else {
1415-
assertTrue(isRemoteNodeConnected("cluster_1", c1Node, service));
1415+
assertTrue(isRemoteNodeConnected(service, "cluster_1", c1Node));
14161416
}
1417-
assertTrue(isRemoteClusterRegistered("cluster_2", service));
1417+
assertTrue(isRemoteClusterRegistered(service, "cluster_2"));
14181418
if (secondRemoteClusterProxyMode) {
1419-
assertFalse(isRemoteNodeConnected("cluster_2", c2Node, service));
1419+
assertFalse(isRemoteNodeConnected(service, "cluster_2", c2Node));
14201420
} else {
1421-
assertTrue(isRemoteNodeConnected("cluster_2", c2Node, service));
1421+
assertTrue(isRemoteNodeConnected(service, "cluster_2", c2Node));
14221422
}
14231423
// No local node connection
14241424
assertEquals(0, transportService.getConnectionManager().size());
@@ -1684,11 +1684,11 @@ private static boolean hasRegisteredClusters(RemoteClusterService service) {
16841684
return service.getRegisteredRemoteClusterNames().isEmpty() == false;
16851685
}
16861686

1687-
private static boolean isRemoteClusterRegistered(String clusterName, RemoteClusterService service) {
1687+
private static boolean isRemoteClusterRegistered(RemoteClusterService service, String clusterName) {
16881688
return service.getRegisteredRemoteClusterNames().contains(clusterName);
16891689
}
16901690

1691-
private static boolean isRemoteNodeConnected(String clusterName, DiscoveryNode node, RemoteClusterService service) {
1691+
public static boolean isRemoteNodeConnected(RemoteClusterService service, String clusterName, DiscoveryNode node) {
16921692
return service.getRemoteClusterConnection(clusterName).isNodeConnected(node);
16931693
}
16941694
}

0 commit comments

Comments
 (0)