Skip to content

Reject RECONNECT_UNLESS_SKIP_UNAVAILABLE in CPS #132955

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

Closed
wants to merge 2 commits into from
+35 −0
Closed

Reject RECONNECT_UNLESS_SKIP_UNAVAILABLE in CPS #132955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19f14c6
Reject RECONNECT_UNLESS_SKIP_UNAVAILABLE in CPS
JeremyDahlgren Aug 14, 2025
86fffe5
Merge branch 'main' into es-12610-reject-reconnect-unless-skip-unavai…
JeremyDahlgren Aug 15, 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
7 changes: 7 additions & 0 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 @@ -651,6 +651,13 @@ public RemoteClusterClient getRemoteClusterClient(
DisconnectedStrategy disconnectedStrategy
) {
ensureClientIsEnabled();
if (isStateless && disconnectedStrategy == DisconnectedStrategy.RECONNECT_UNLESS_SKIP_UNAVAILABLE) {
final var message = "DisconnectedStrategy ["
+ DisconnectedStrategy.RECONNECT_UNLESS_SKIP_UNAVAILABLE
+ "] is not supported in stateless environments";
assert false : message;
Comment on lines +654 to +658
Copy link
Member

Choose a reason for hiding this comment

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

We talked about deferring this change until search side has made its changes. But I guess it's OK to proceed here because the condition is guarded with isStateless?

throw new IllegalArgumentException(message);
}
if (transportService.getRemoteClusterService().getRegisteredRemoteClusterNames().contains(clusterAlias) == false) {
throw new NoSuchRemoteClusterException(clusterAlias);
}
Expand Down
28 changes: 28 additions & 0 deletions server/src/test/java/org/elasticsearch/transport/RemoteClusterClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,34 @@ public void testRemoteClusterServiceNotEnabled() {
}
}

public void testGetRemoteClusterClientRejectsReconnectUnlessSkipUnavailableInStateless() {
final var settings = Settings.builder().put("stateless.enabled", true).putList("node.roles", "remote_cluster_client").build();
try (
MockTransportService service = MockTransportService.createNewService(
settings,
VersionInformation.CURRENT,
TransportVersion.current(),
threadPool,
null
)
) {
final var remoteClusterService = service.getRemoteClusterService();
final var unsupportedDisconnectedStrategy = RemoteClusterService.DisconnectedStrategy.RECONNECT_UNLESS_SKIP_UNAVAILABLE;
final var error = expectThrows(
AssertionError.class,
() -> remoteClusterService.getRemoteClusterClient(
"test",
EsExecutors.DIRECT_EXECUTOR_SERVICE,
unsupportedDisconnectedStrategy
)
);
assertThat(
error.getMessage(),
equalTo("DisconnectedStrategy [" + unsupportedDisconnectedStrategy + "] is not supported in stateless environments")
);
}
}

public void testQuicklySkipUnavailableClusters() throws Exception {
Settings remoteSettings = Settings.builder().put(ClusterName.CLUSTER_NAME_SETTING.getKey(), "foo_bar_cluster").build();
try (
Expand Down