Skip to content

Set RemoteClusterPortSettings.PORT default to 9400 in stateless #132507

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 6 commits into from
Aug 7, 2025
Merged

Set RemoteClusterPortSettings.PORT default to 9400 in stateless #132507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a34880
Set RemoteClusterPortSettings.PORT default to 9400 in stateless
JeremyDahlgren Aug 6, 2025
eeb092d
Update docs/changelog/132507.yaml
JeremyDahlgren Aug 6, 2025
c0e4634
Delete docs/changelog/132507.yaml
JeremyDahlgren Aug 7, 2025
056e019
Merge branch 'main' into es-12587-cps-enable-remote-cluster-server-port
JeremyDahlgren Aug 7, 2025
e138391
Merge branch 'main' into es-12587-cps-enable-remote-cluster-server-port
JeremyDahlgren Aug 7, 2025
07bc944
Merge branch 'main' into es-12587-cps-enable-remote-cluster-server-port
JeremyDahlgren Aug 7, 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
9 changes: 8 additions & 1 deletion server/src/main/java/org/elasticsearch/transport/RemoteClusterPortSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
Expand Down Expand Up @@ -70,7 +71,13 @@ public class RemoteClusterPortSettings {
Setting.Property.NodeScope
);

public static final Setting<Integer> PORT = intSetting(REMOTE_CLUSTER_PREFIX + "port", 9443, 0, 65535, Setting.Property.NodeScope);
public static final Setting<Integer> PORT = intSetting(
REMOTE_CLUSTER_PREFIX + "port",
(settings) -> DiscoveryNode.isStateless(settings) ? "9400" : "9443",
0,
65535,
Setting.Property.NodeScope
);

// The default value of -1 means it will use the default bind port as shown above
public static final Setting<Integer> PUBLISH_PORT = intSetting(
Expand Down
8 changes: 8 additions & 0 deletions server/src/test/java/org/elasticsearch/transport/RemoteClusterPortSettingsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

package org.elasticsearch.transport;

import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.network.NetworkAddress;
import org.elasticsearch.common.network.NetworkService;
import org.elasticsearch.common.settings.Setting;
Expand Down Expand Up @@ -204,4 +205,11 @@ public void testPortSettingsConstruction() {
assertThat(profileSettings.isDefaultProfile, equalTo(false));
}

public void testRemoteClusterPortDefaultValue() {
assertThat(RemoteClusterPortSettings.PORT.getDefault(Settings.EMPTY), equalTo(9443));
assertThat(
RemoteClusterPortSettings.PORT.getDefault(Settings.builder().put(DiscoveryNode.STATELESS_ENABLED_SETTING_NAME, true).build()),
equalTo(9400)
);
}
}