Skip to content

Register the TCP_CONNECT_TIMEOUT setting #36663

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
Tim-Brooks merged 2 commits into from
Dec 15, 2018
Merged

Register the TCP_CONNECT_TIMEOUT setting #36663

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
9095a1f
Register the TCP_CONNECT_TIMEOUT setting
Tim-Brooks Dec 14, 2018
0e51dee
Add comment
Tim-Brooks Dec 14, 2018
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
1 change: 1 addition & 0 deletions server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ public void apply(Settings value, Settings current, Settings previous) {
TransportSettings.OLD_TRANSPORT_COMPRESS,
TransportSettings.TRANSPORT_COMPRESS,
TransportSettings.PING_SCHEDULE,
TransportSettings.TCP_CONNECT_TIMEOUT,
TransportSettings.CONNECT_TIMEOUT,
TransportSettings.DEFAULT_FEATURES_SETTING,
TransportSettings.OLD_TCP_NO_DELAY,
Expand Down
1 change: 1 addition & 0 deletions server/src/main/java/org/elasticsearch/transport/TransportSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public final class TransportSettings {
// the scheduled internal ping interval setting, defaults to disabled (-1)
public static final Setting<TimeValue> PING_SCHEDULE =
timeSetting("transport.ping_schedule", TimeValue.timeValueSeconds(-1), Setting.Property.NodeScope);
// TODO: Deprecate in 7.0
public static final Setting<TimeValue> TCP_CONNECT_TIMEOUT =
timeSetting("transport.tcp.connect_timeout", NetworkService.TCP_CONNECT_TIMEOUT, Setting.Property.NodeScope);
public static final Setting<TimeValue> CONNECT_TIMEOUT =
Expand Down