Add LinkedProjectConfigService with ClusterSettings implementation
#133834
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
JeremyDahlgren
added
:Distributed Coordination/Network
JeremyDahlgren
force-pushed
the
es-12730-linked-proj-cfg-svc-cluster-settings
branch
from
a6f085b to
acaa03d
Compare
Adds a new interface LinkedProjectConfigService for registering LinkedProjectConfigListener instances to receive linked project configuration updates. This change introduces an abstract base class and a ClusterSettings based concrete class that provides the same functionality that was previously implemented in RemoteClusterAware and RemoteClusterService. Subclasses of RemoteClusterAware have been adjusted to receive LinkedProjectConfig updates instead of Settings updates. These changes allow for other linked project config implementations to be used in the system, freeing consumers of the updates from the details of the update mechanism used. Resolves: ES-12730
JeremyDahlgren
force-pushed
the
es-12730-linked-proj-cfg-svc-cluster-settings
branch
from
acaa03d to
616359b
Compare
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
ywangd
reviewed
Sep 5, 2025
server/src/main/java/org/elasticsearch/transport/LinkedProjectConfigService.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/plugin/EqlPlugin.java
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/LinkedProjectConfigService.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/ClusterSettingsLinkedProjectConfigService.java
Show resolved
Hide resolved
Comment on lines
278
to
282
| new ClusterSettingsLinkedProjectConfigService( | ||
| settings, | ||
| clusterSettings != null ? clusterSettings : ClusterSettings.createBuiltInClusterSettings(), | ||
| DefaultProjectResolver.INSTANCE | ||
| ), |
There was a problem hiding this comment.
Maybe this is where we can use the LinkedProjectConfigService.NOOP when clusterSettings == null? I feel its behaviour is more aligned with the existing code, i.e. no settings consumer registrion and no update for remoteCluserService.
There was a problem hiding this comment.
Many tests going through this constructor path depend on non-noop behavior. But they do not depend on the ClusterSettings update mechanism in all cases. I needed to refactor ClusterSettingsLinkedProjectConfigService so that it could still be used and support getInitialLinkedProjectConfigs() which is backed by the initial node level Settings, without registering ClusterSettings update consumers if the ClusterSettings are null.
Also I moved linkedProjectConfigService.register(remoteClusterService) call in TransportService outside of the if (clusterSettings != null) block. LinkedProjectConfigService should not be coupled with ClusterSettings.
server/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java
Outdated
Show resolved
Hide resolved
ywangd
approved these changes
Sep 9, 2025
server/src/test/java/org/elasticsearch/transport/RemoteClusterServiceTests.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java
Outdated
Show resolved
Hide resolved
Kubik42
pushed a commit
to Kubik42/elasticsearch
that referenced
this pull request
Sep 9, 2025
…lastic#133834) Adds a new interface LinkedProjectConfigService for registering LinkedProjectConfigListener instances to receive linked project configuration updates. This change introduces an abstract base class and a ClusterSettings based concrete class that provides the same functionality that was previously implemented in RemoteClusterAware and RemoteClusterService. Subclasses of RemoteClusterAware have been adjusted to receive LinkedProjectConfig updates instead of Settings updates. These changes allow for other linked project config implementations to be used in the system, freeing consumers of the updates from the details of the update mechanism used. Resolves: ES-12730
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.
Builds on work done in #133266. Adds a new interface
LinkedProjectConfigServicefor registeringLinkedProjectConfigListenerinstances to receive linked project configuration updates. This change introduces an abstract base class and aClusterSettingsbased concrete class that provides the same functionality that was previously implemented inRemoteClusterAwareandRemoteClusterService.Subclasses of
RemoteClusterAwarehave been adjusted to receiveLinkedProjectConfigupdates instead ofSettingsupdates.These changes allow for other linked project config implementations to be used in the system, freeing consumers of the updates from the details of the update mechanism used.
Resolves: ES-12730