Use LinkedProjectConfig in RemoteClusterService
#133266
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Moves all remaining settings and supporting methods into RemoteClusterSettings and introduces a configuration record type LinkedProjectConfig that can be built from the settings. Refactors RemoteClusterService and the related classes to use the LinkedProjectConfig, with settings extraction at higher levels in RemoteClusterService and RemoteClusterAware and its subclasses. This is another step towards supporting multiple origin projects with linked project configuration built from cluster state ProjectCustom updates. Resolves: ES-12656, ES-12569
JeremyDahlgren
added
:Distributed Coordination/Network
ywangd
reviewed
Aug 21, 2025
server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/LinkedProjectConfig.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/LinkedProjectConfig.java
Outdated
Show resolved
Hide resolved
JeremyDahlgren
changed the title
LinkedProjectConfig record in RemoteClusterServiceLinkedProjectConfig in RemoteClusterService
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
ywangd
reviewed
Aug 26, 2025
server/src/main/java/org/elasticsearch/transport/LinkedProjectConfig.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/LinkedProjectConfig.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/RemoteClusterSettings.java
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/LinkedProjectConfig.java
Outdated
Show resolved
Hide resolved
Comment on lines
183
to
187
| private Builder(ProjectId originProjectId, ProjectId linkedProjectId, String linkedProjectAlias) { | ||
| originProjectId(originProjectId); | ||
| linkedProjectId(linkedProjectId); | ||
| linkedProjectAlias(linkedProjectAlias); | ||
| } |
There was a problem hiding this comment.
I am really torn on how this builder should work. I am not a big fan of having a single builder for both config classes so that my intuition is to go with a base builder and subclasses. But that means using generic which adds complexity and may not worth it since we have only two variants. So I think we can stick with this current approach. But can we make it a bit stricter?
- Can
connectionStrategy, i.e.mode, also be decided upfront and passed as a constructor argument? - If we do the above, we should be able to configure the default
maxNumConnectionsconditionally based on theconnectionStrategyso that there is no need to have separatesniffMaxNumConnectionsandproxyNumSocketConnectionsfields (and methods)? - The value of
connectionStrategycan be used to validate whether builder method is should be called, e.g. if the strategy isproxy, thesniffSeedNodesshould throw exception. - Can we make all field passed in constructor
final? It does not seem reasonable to change these fields, e.g.originalProjectIdorconnectionStrategyin following build methods?
There was a problem hiding this comment.
I didn't like how a single build() function ended up requiring casts, so I refactored into builder subclasses. Let me know what you think of how it turned out.
server/src/main/java/org/elasticsearch/transport/LinkedProjectConfig.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/LinkedProjectConfig.java
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/RemoteClusterSettings.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/RemoteConnectionStrategy.java
Outdated
Show resolved
Hide resolved
server/src/test/java/org/elasticsearch/transport/LinkedProjectConfigTests.java
Outdated
Show resolved
Hide resolved
ywangd
approved these changes
Aug 27, 2025
server/src/main/java/org/elasticsearch/transport/LinkedProjectConfig.java
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Moves all remaining settings and supporting methods into
RemoteClusterSettingsand introduces a configuration interfaceLinkedProjectConfigwith record types for proxy and sniff configurations.RemoteClusterSettingshas static helper methods to build the config instances from settings. RefactorsRemoteClusterServiceand the related classes to use theLinkedProjectConfig, with settings extraction at higher levels inRemoteClusterServiceandRemoteClusterAwareand its subclasses.This is another step towards supporting multiple origin projects with linked project configuration built from cluster state
ProjectCustomupdates in CPS.Resolves: ES-12656, ES-12569