Skip to content

Commit 508f65e

Browse files
DaveCTurnergeorgewallace
DaveCTurner
authored and
georgewallace
committed
Inline MockTransportService#getLocalDiscoNode() (elastic#114883)
This method just delegates to `getLocalNode()`, we may as well call the more widely-used method with the shorter name directly.
1 parent 15c18ee commit 508f65e

File tree

15 files changed

+90
-95
lines changed

15 files changed

+90
-95
lines changed

‎modules/transport-netty4/src/test/java/org/elasticsearch/transport/netty4/SimpleNetty4TransportTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void testDefaultKeepAliveSettings() throws IOException {
103103
MockTransportService serviceD = buildService("TS_D", VersionInformation.CURRENT, TransportVersion.current(), Settings.EMPTY)
104104
) {
105105

106-
try (Transport.Connection connection = openConnection(serviceC, serviceD.getLocalDiscoNode(), TestProfiles.LIGHT_PROFILE)) {
106+
try (Transport.Connection connection = openConnection(serviceC, serviceD.getLocalNode(), TestProfiles.LIGHT_PROFILE)) {
107107
assertThat(connection, instanceOf(StubbableTransport.WrappedConnection.class));
108108
Transport.Connection conn = ((StubbableTransport.WrappedConnection) connection).getConnection();
109109
assertThat(conn, instanceOf(TcpTransport.NodeChannels.class));
@@ -147,7 +147,7 @@ public void testTransportProfile() {
147147
MockTransportService serviceD = buildService("TS_D", VersionInformation.CURRENT, TransportVersion.current(), Settings.EMPTY)
148148
) {
149149

150-
try (Transport.Connection connection = openConnection(serviceC, serviceD.getLocalDiscoNode(), connectionProfile)) {
150+
try (Transport.Connection connection = openConnection(serviceC, serviceD.getLocalNode(), connectionProfile)) {
151151
assertThat(connection, instanceOf(StubbableTransport.WrappedConnection.class));
152152
Transport.Connection conn = ((StubbableTransport.WrappedConnection) connection).getConnection();
153153
assertThat(conn, instanceOf(TcpTransport.NodeChannels.class));

‎qa/ccs-unavailable-clusters/src/javaRestTest/java/org/elasticsearch/search/CrossClusterSearchUnavailableClusterIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public void testSearchSkipUnavailable() throws IOException {
154154
threadPool
155155
)
156156
) {
157-
DiscoveryNode remoteNode = remoteTransport.getLocalDiscoNode();
157+
DiscoveryNode remoteNode = remoteTransport.getLocalNode();
158158

159159
updateRemoteClusterSettings(Collections.singletonMap("seeds", remoteNode.getAddress().toString()));
160160

@@ -307,7 +307,7 @@ public void testSkipUnavailableDependsOnSeeds() throws IOException {
307307
threadPool
308308
)
309309
) {
310-
DiscoveryNode remoteNode = remoteTransport.getLocalDiscoNode();
310+
DiscoveryNode remoteNode = remoteTransport.getLocalNode();
311311

312312
{
313313
// check that skip_unavailable alone cannot be set

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ private MockTransportService[] startTransport(
486486
threadPool
487487
);
488488
mockTransportServices[i] = remoteSeedTransport;
489-
DiscoveryNode remoteSeedNode = remoteSeedTransport.getLocalDiscoNode();
489+
DiscoveryNode remoteSeedNode = remoteSeedTransport.getLocalNode();
490490
knownNodes.add(remoteSeedNode);
491491
nodes[i] = remoteSeedNode;
492492
settingsBuilder.put("cluster.remote.remote" + i + ".seeds", remoteSeedNode.getAddress().toString());

‎server/src/test/java/org/elasticsearch/tasks/BanFailureLoggingTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,13 @@ public Task createTask(long id, String type, String action, TaskId parentTaskId,
157157

158158
parentTransportService.addSendBehavior(sendRequestBehavior);
159159

160-
AbstractSimpleTransportTestCase.connectToNode(parentTransportService, childTransportService.getLocalDiscoNode());
160+
AbstractSimpleTransportTestCase.connectToNode(parentTransportService, childTransportService.getLocalNode());
161161

162162
final CancellableTask parentTask = (CancellableTask) parentTransportService.getTaskManager()
163163
.register("transport", "internal:testAction", new ParentRequest());
164164

165165
parentTransportService.sendChildRequest(
166-
childTransportService.getLocalDiscoNode(),
166+
childTransportService.getLocalNode(),
167167
"internal:testAction[c]",
168168
new EmptyRequest(),
169169
parentTask,
@@ -172,7 +172,7 @@ public Task createTask(long id, String type, String action, TaskId parentTaskId,
172172
);
173173

174174
try (MockLog mockLog = MockLog.capture(TaskCancellationService.class)) {
175-
for (MockLog.LoggingExpectation expectation : expectations.apply(childTransportService.getLocalDiscoNode())) {
175+
for (MockLog.LoggingExpectation expectation : expectations.apply(childTransportService.getLocalNode())) {
176176
mockLog.addExpectation(expectation);
177177
}
178178

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void testRemoteTaskCancellationOnFailedResponse() throws Exception {
8989
) {
9090
remoteTransport.getTaskManager().setTaskCancellationService(new TaskCancellationService(remoteTransport));
9191
Settings.Builder builder = Settings.builder();
92-
builder.putList("cluster.remote.cluster1.seeds", remoteTransport.getLocalDiscoNode().getAddress().toString());
92+
builder.putList("cluster.remote.cluster1.seeds", remoteTransport.getLocalNode().getAddress().toString());
9393
try (
9494
MockTransportService localService = MockTransportService.createNewService(
9595
builder.build(),
@@ -163,11 +163,11 @@ public void testSearchShards() throws Exception {
163163
MockTransportService seedTransport = startTransport("seed_node", knownNodes);
164164
MockTransportService discoverableTransport = startTransport("discoverable_node", knownNodes)
165165
) {
166-
knownNodes.add(seedTransport.getLocalDiscoNode());
167-
knownNodes.add(discoverableTransport.getLocalDiscoNode());
166+
knownNodes.add(seedTransport.getLocalNode());
167+
knownNodes.add(discoverableTransport.getLocalNode());
168168
Collections.shuffle(knownNodes, random());
169169
Settings.Builder builder = Settings.builder();
170-
builder.putList("cluster.remote.cluster1.seeds", seedTransport.getLocalDiscoNode().getAddress().toString());
170+
builder.putList("cluster.remote.cluster1.seeds", seedTransport.getLocalNode().getAddress().toString());
171171
try (
172172
MockTransportService service = MockTransportService.createNewService(
173173
builder.build(),
@@ -216,11 +216,11 @@ public void testSearchShardsThreadContextHeader() {
216216
MockTransportService seedTransport = startTransport("seed_node", knownNodes);
217217
MockTransportService discoverableTransport = startTransport("discoverable_node", knownNodes)
218218
) {
219-
knownNodes.add(seedTransport.getLocalDiscoNode());
220-
knownNodes.add(discoverableTransport.getLocalDiscoNode());
219+
knownNodes.add(seedTransport.getLocalNode());
220+
knownNodes.add(discoverableTransport.getLocalNode());
221221
Collections.shuffle(knownNodes, random());
222222
Settings.Builder builder = Settings.builder();
223-
builder.putList("cluster.remote.cluster1.seeds", seedTransport.getLocalDiscoNode().getAddress().toString());
223+
builder.putList("cluster.remote.cluster1.seeds", seedTransport.getLocalNode().getAddress().toString());
224224
try (
225225
MockTransportService service = MockTransportService.createNewService(
226226
builder.build(),

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void testConnectAndExecuteRequest() throws Exception {
7373
remoteSettings
7474
)
7575
) {
76-
DiscoveryNode remoteNode = remoteTransport.getLocalDiscoNode();
76+
DiscoveryNode remoteNode = remoteTransport.getLocalNode();
7777

7878
Settings localSettings = Settings.builder()
7979
.put(onlyRole(DiscoveryNodeRole.REMOTE_CLUSTER_CLIENT_ROLE))
@@ -152,7 +152,7 @@ public void testEnsureWeReconnect() throws Exception {
152152
remoteSettings
153153
)
154154
) {
155-
DiscoveryNode remoteNode = remoteTransport.getLocalDiscoNode();
155+
DiscoveryNode remoteNode = remoteTransport.getLocalNode();
156156
Settings localSettings = Settings.builder()
157157
.put(onlyRole(DiscoveryNodeRole.REMOTE_CLUSTER_CLIENT_ROLE))
158158
.put("cluster.remote.test.seeds", remoteNode.getAddress().getAddress() + ":" + remoteNode.getAddress().getPort())
@@ -251,7 +251,7 @@ public void testQuicklySkipUnavailableClusters() throws Exception {
251251
remoteSettings
252252
)
253253
) {
254-
DiscoveryNode remoteNode = remoteTransport.getLocalDiscoNode();
254+
DiscoveryNode remoteNode = remoteTransport.getLocalNode();
255255

256256
Settings localSettings = Settings.builder()
257257
.put(onlyRole(DiscoveryNodeRole.REMOTE_CLUSTER_CLIENT_ROLE))

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -311,11 +311,11 @@ public void testCloseWhileConcurrentlyConnecting() throws IOException, Interrupt
311311
TransportVersion.current()
312312
)
313313
) {
314-
DiscoveryNode seedNode = seedTransport.getLocalDiscoNode();
315-
DiscoveryNode seedNode1 = seedTransport1.getLocalDiscoNode();
316-
knownNodes.add(seedTransport.getLocalDiscoNode());
317-
knownNodes.add(discoverableTransport.getLocalDiscoNode());
318-
knownNodes.add(seedTransport1.getLocalDiscoNode());
314+
DiscoveryNode seedNode = seedTransport.getLocalNode();
315+
DiscoveryNode seedNode1 = seedTransport1.getLocalNode();
316+
knownNodes.add(seedTransport.getLocalNode());
317+
knownNodes.add(discoverableTransport.getLocalNode());
318+
knownNodes.add(seedTransport1.getLocalNode());
319319
Collections.shuffle(knownNodes, random());
320320
List<String> seedNodes = addresses(seedNode1, seedNode);
321321
Collections.shuffle(seedNodes, random());
@@ -447,9 +447,9 @@ private void doTestGetConnectionInfo(boolean hasClusterCredentials) throws Excep
447447
seedTransportSettings
448448
)
449449
) {
450-
DiscoveryNode node1 = transport1.getLocalDiscoNode();
451-
DiscoveryNode node2 = transport3.getLocalDiscoNode();
452-
DiscoveryNode node3 = transport2.getLocalDiscoNode();
450+
DiscoveryNode node1 = transport1.getLocalNode();
451+
DiscoveryNode node2 = transport3.getLocalNode();
452+
DiscoveryNode node3 = transport2.getLocalNode();
453453
if (hasClusterCredentials) {
454454
node1 = node1.withTransportAddress(transport1.boundRemoteAccessAddress().publishAddress());
455455
node2 = node2.withTransportAddress(transport3.boundRemoteAccessAddress().publishAddress());
@@ -645,7 +645,7 @@ private void doTestCollectNodes(boolean hasClusterCredentials) throws Exception
645645
seedTransportSettings
646646
)
647647
) {
648-
DiscoveryNode seedNode = seedTransport.getLocalDiscoNode();
648+
DiscoveryNode seedNode = seedTransport.getLocalNode();
649649
if (hasClusterCredentials) {
650650
seedNode = seedNode.withTransportAddress(seedTransport.boundRemoteAccessAddress().publishAddress());
651651
}
@@ -725,8 +725,8 @@ public void testNoChannelsExceptREG() throws Exception {
725725
TransportVersion.current()
726726
)
727727
) {
728-
DiscoveryNode seedNode = seedTransport.getLocalDiscoNode();
729-
knownNodes.add(seedTransport.getLocalDiscoNode());
728+
DiscoveryNode seedNode = seedTransport.getLocalNode();
729+
knownNodes.add(seedTransport.getLocalNode());
730730
try (
731731
MockTransportService service = MockTransportService.createNewService(
732732
Settings.EMPTY,

0 commit comments

Comments
 (0)