Skip to content

Commit 752b096

Browse files
Pass MockNode LinkedProjectConfigService to MockTransportService
NodeConstruction creates a LinkedProjectConfigService via SPI. This instance is passed to MockNode, but currently it is not forwarded on to the MockTransportService, which results in a new ClusterSettingsLinkedProjectConfigService being created. This change plumbs the instance passed into MockNode down into the MockTransportService. In serverless tests we'll be using an implementation based on the new ProjectCustom so we must be able to get this new implementation created via SPI and passed through the MockNode and into the MockTransportService so it can be used in RemoteClusterService. Relates: ES-12270
1 parent 3979d74 commit 752b096

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

test/framework/src/main/java/org/elasticsearch/node/MockNode.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.elasticsearch.test.ESTestCase;
5050
import org.elasticsearch.test.MockHttpTransport;
5151
import org.elasticsearch.test.transport.MockTransportService;
52+
import org.elasticsearch.test.transport.StubbableTransport;
5253
import org.elasticsearch.threadpool.ThreadPool;
5354
import org.elasticsearch.transport.LinkedProjectConfigService;
5455
import org.elasticsearch.transport.Transport;
@@ -201,13 +202,14 @@ protected TransportService newTransportService(
201202
} else {
202203
return new MockTransportService(
203204
settings,
204-
transport,
205+
new StubbableTransport(transport),
205206
threadPool,
206207
interceptor,
207208
localNodeFactory,
208209
clusterSettings,
209-
taskManager.getTaskHeaders(),
210-
nodeId
210+
MockTransportService.createTaskManager(settings, threadPool, taskManager.getTaskHeaders(), Tracer.NOOP, nodeId),
211+
linkedProjectConfigService,
212+
projectResolver
211213
);
212214
}
213215
}

test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import org.elasticsearch.cluster.node.DiscoveryNode;
1919
import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
2020
import org.elasticsearch.cluster.node.VersionInformation;
21+
import org.elasticsearch.cluster.project.DefaultProjectResolver;
22+
import org.elasticsearch.cluster.project.ProjectResolver;
2123
import org.elasticsearch.common.UUIDs;
2224
import org.elasticsearch.common.io.stream.BytesStreamOutput;
2325
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -51,8 +53,10 @@
5153
import org.elasticsearch.test.tasks.MockTaskManager;
5254
import org.elasticsearch.threadpool.ThreadPool;
5355
import org.elasticsearch.transport.ClusterConnectionManager;
56+
import org.elasticsearch.transport.ClusterSettingsLinkedProjectConfigService;
5457
import org.elasticsearch.transport.ConnectTransportException;
5558
import org.elasticsearch.transport.ConnectionProfile;
59+
import org.elasticsearch.transport.LinkedProjectConfigService;
5660
import org.elasticsearch.transport.NodeNotConnectedException;
5761
import org.elasticsearch.transport.RequestHandlerRegistry;
5862
import org.elasticsearch.transport.TcpTransport;
@@ -262,32 +266,36 @@ public MockTransportService(
262266

263267
public MockTransportService(
264268
Settings settings,
265-
Transport transport,
269+
StubbableTransport transport,
266270
ThreadPool threadPool,
267271
TransportInterceptor interceptor,
268272
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
269273
@Nullable ClusterSettings clusterSettings,
270-
String nodeId
274+
TaskManager taskManager
271275
) {
272276
this(
273277
settings,
274-
new StubbableTransport(transport),
278+
transport,
275279
threadPool,
276280
interceptor,
277281
localNodeFactory,
278282
clusterSettings,
279-
createTaskManager(settings, threadPool, Set.of(), Tracer.NOOP, nodeId)
283+
taskManager,
284+
new ClusterSettingsLinkedProjectConfigService(settings, clusterSettings, DefaultProjectResolver.INSTANCE),
285+
DefaultProjectResolver.INSTANCE
280286
);
281287
}
282288

283-
private MockTransportService(
289+
public MockTransportService(
284290
Settings settings,
285291
StubbableTransport transport,
286292
ThreadPool threadPool,
287293
TransportInterceptor interceptor,
288294
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
289295
@Nullable ClusterSettings clusterSettings,
290-
TaskManager taskManager
296+
TaskManager taskManager,
297+
LinkedProjectConfigService linkedProjectConfigService,
298+
ProjectResolver projectResolver
291299
) {
292300
super(
293301
settings,
@@ -297,7 +305,9 @@ private MockTransportService(
297305
localNodeFactory,
298306
clusterSettings,
299307
new StubbableConnectionManager(new ClusterConnectionManager(settings, transport, threadPool.getThreadContext())),
300-
taskManager
308+
taskManager,
309+
linkedProjectConfigService,
310+
projectResolver
301311
);
302312
this.original = transport.getDelegate();
303313
this.testExecutor = EsExecutors.newScaling(

0 commit comments

Comments
 (0)