Skip to content

Add ProjectResolver to RemoteClusterService constructor #133006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Aug 28, 2025
Merged

Add ProjectResolver to RemoteClusterService constructor #133006

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0e90fc8
Add ProjectResolver to RemoteClusterService constructor
JeremyDahlgren Aug 15, 2025
0723716
[CI] Auto commit changes from spotless
Aug 15, 2025
5d10a2a
Merge branch 'main' into es-12572-add-proj-resolver-to-rcs-ctor
JeremyDahlgren Aug 15, 2025
603f850
Merge branch 'main' into es-12572-add-proj-resolver-to-rcs-ctor
JeremyDahlgren Aug 16, 2025
70a9ad5
Merge branch 'main' into es-12572-add-proj-resolver-to-rcs-ctor
JeremyDahlgren Aug 18, 2025
18b6f6d
Fixed constructor comments about access level for tests
JeremyDahlgren Aug 27, 2025
bf4339c
Merge branch 'main' into es-12572-add-proj-resolver-to-rcs-ctor
JeremyDahlgren Aug 27, 2025
0bac8b5
Mute cluster.stats/30_ccs_stats/cross-cluster search stats search
JeremyDahlgren Aug 27, 2025
f4e16f3
Merge branch 'main' into es-12572-add-proj-resolver-to-rcs-ctor
JeremyDahlgren Aug 27, 2025
d89d0f7
Merge branch 'main' into es-12572-add-proj-resolver-to-rcs-ctor
JeremyDahlgren Aug 27, 2025
69a704b
Replace multi-project project ID assertion with FixForMultiProject an…
JeremyDahlgren Aug 27, 2025
b7c6291
Merge branch 'main' into es-12572-add-proj-resolver-to-rcs-ctor
JeremyDahlgren Aug 27, 2025
332738f
Merge branch 'main' into es-12572-add-proj-resolver-to-rcs-ctor
JeremyDahlgren Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/node/NodeConstruction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,8 @@ public Map<String, String> queryFields() {
settingsModule.getClusterSettings(),
taskManager,
telemetryProvider.getTracer(),
nodeEnvironment.nodeId()
nodeEnvironment.nodeId(),
projectResolver
);
final SearchResponseMetrics searchResponseMetrics = new SearchResponseMetrics(telemetryProvider.getMeterRegistry());
final SearchTransportService searchTransportService = new SearchTransportService(
Expand Down
16 changes: 14 additions & 2 deletions server/src/main/java/org/elasticsearch/node/NodeServiceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.elasticsearch.tasks.TaskManager;
import org.elasticsearch.telemetry.tracing.Tracer;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.ClusterConnectionManager;
import org.elasticsearch.transport.Transport;
import org.elasticsearch.transport.TransportInterceptor;
import org.elasticsearch.transport.TransportService;
Expand Down Expand Up @@ -119,9 +120,20 @@ TransportService newTransportService(
ClusterSettings clusterSettings,
TaskManager taskManager,
Tracer tracer,
String nodeId
String nodeId,
ProjectResolver projectResolver
) {
return new TransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskManager);
return new TransportService(
settings,
transport,
threadPool,
interceptor,
localNodeFactory,
clusterSettings,
new ClusterConnectionManager(settings, transport, threadPool.getThreadContext()),
taskManager,
projectResolver
);
}

HttpServerTransport newHttpTransport(PluginsService pluginsService, NetworkModule networkModule) {
Expand Down
6 changes: 2 additions & 4 deletions server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.elasticsearch.cluster.metadata.ProjectId;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodeRole;
import org.elasticsearch.cluster.project.DefaultProjectResolver;
import org.elasticsearch.cluster.project.ProjectResolver;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.settings.ClusterSettings;
Expand Down Expand Up @@ -161,15 +160,14 @@ public boolean isRemoteClusterServerEnabled() {
private final RemoteClusterCredentialsManager remoteClusterCredentialsManager;
private final ProjectResolver projectResolver;

@FixForMultiProject(description = "Inject the ProjectResolver instance.")
RemoteClusterService(Settings settings, TransportService transportService) {
RemoteClusterService(Settings settings, TransportService transportService, ProjectResolver projectResolver) {
super(settings);
this.isRemoteClusterClient = DiscoveryNode.isRemoteClusterClient(settings);
this.isSearchNode = DiscoveryNode.hasRole(settings, DiscoveryNodeRole.SEARCH_ROLE);
this.isStateless = DiscoveryNode.isStateless(settings);
this.remoteClusterServerEnabled = REMOTE_CLUSTER_SERVER_ENABLED.get(settings);
this.transportService = transportService;
this.projectResolver = DefaultProjectResolver.INSTANCE;
this.projectResolver = projectResolver;
this.remoteClusters = projectResolver.supportsMultipleProjects()
? ConcurrentCollections.newConcurrentMap()
: Map.of(ProjectId.DEFAULT, ConcurrentCollections.newConcurrentMap());
Expand Down
32 changes: 29 additions & 3 deletions server/src/main/java/org/elasticsearch/transport/TransportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import org.elasticsearch.action.ActionListenerResponseHandler;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.project.DefaultProjectResolver;
import org.elasticsearch.cluster.project.ProjectResolver;
import org.elasticsearch.common.ReferenceDocs;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.component.AbstractLifecycleComponent;
Expand Down Expand Up @@ -249,12 +251,11 @@ public TransportService(
transportInterceptor,
localNodeFactory,
clusterSettings,
new ClusterConnectionManager(settings, transport, threadPool.getThreadContext()),
new TaskManager(settings, threadPool, taskHeaders)
);
}

@SuppressWarnings("this-escape")
// NOTE: Only for use in tests
public TransportService(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Convention for this kind of comment is something like "public for testing"

Settings settings,
Transport transport,
Expand All @@ -264,6 +265,31 @@ public TransportService(
@Nullable ClusterSettings clusterSettings,
ConnectionManager connectionManager,
TaskManager taskManger
) {
this(
settings,
transport,
threadPool,
transportInterceptor,
localNodeFactory,
clusterSettings,
connectionManager,
taskManger,
DefaultProjectResolver.INSTANCE
);
}

@SuppressWarnings("this-escape")
public TransportService(
Settings settings,
Transport transport,
ThreadPool threadPool,
TransportInterceptor transportInterceptor,
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
@Nullable ClusterSettings clusterSettings,
ConnectionManager connectionManager,
TaskManager taskManger,
ProjectResolver projectResolver
) {
this.transport = transport;
transport.setSlowLogThreshold(TransportSettings.SLOW_OPERATION_THRESHOLD_SETTING.get(settings));
Expand All @@ -278,7 +304,7 @@ public TransportService(
this.asyncSender = interceptor.interceptSender(this::sendRequestInternal);
this.remoteClusterClient = DiscoveryNode.isRemoteClusterClient(settings);
this.enableStackOverflowAvoidance = ENABLE_STACK_OVERFLOW_AVOIDANCE.get(settings);
remoteClusterService = new RemoteClusterService(settings, this);
remoteClusterService = new RemoteClusterService(settings, this, projectResolver);
responseHandlers = transport.getResponseHandlers();
if (clusterSettings != null) {
clusterSettings.addSettingsUpdateConsumer(TransportSettings.TRACE_LOG_INCLUDE_SETTING, this::setTracerLogInclude);
Expand Down
Loading