From 9eb00ead37da6fd85d6b6ea90fb7fb665ae4772a Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Mon, 18 Dec 2017 15:57:18 -0600 Subject: [PATCH 1/2] Default to no http read timeout Elasticsearch offers a number of http requests that can take a while to execute. In #27713 we introduced an http read timeout that defaulted to 30 seconds. This means that if no reads happened for 30 seconds (even after a request is received), the connection would be closed due to timeout. This commit disables the read timeout by default to allow us to evaluate the impact of read timeouts and to avoid introducing distruptive behavior. --- .../main/java/org/elasticsearch/http/HttpTransportSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/elasticsearch/http/HttpTransportSettings.java b/core/src/main/java/org/elasticsearch/http/HttpTransportSettings.java index cf9bd3a42ee13..146999240c3c2 100644 --- a/core/src/main/java/org/elasticsearch/http/HttpTransportSettings.java +++ b/core/src/main/java/org/elasticsearch/http/HttpTransportSettings.java @@ -96,7 +96,7 @@ public final class HttpTransportSettings { Setting.boolSetting("http.reset_cookies", false, Property.NodeScope); public static final Setting SETTING_HTTP_READ_TIMEOUT = - Setting.timeSetting("http.read_timeout", new TimeValue(30, TimeUnit.SECONDS), new TimeValue(0), Property.NodeScope); + Setting.timeSetting("http.read_timeout", new TimeValue(0), new TimeValue(0), Property.NodeScope); public static final Setting SETTING_HTTP_TCP_NO_DELAY = boolSetting("http.tcp_no_delay", NetworkService.TCP_NO_DELAY, Setting.Property.NodeScope); From 0df06194f111a53269e3b2c2419b6147cf68831e Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Tue, 19 Dec 2017 10:01:59 -0600 Subject: [PATCH 2/2] Add comment --- .../main/java/org/elasticsearch/http/HttpTransportSettings.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/org/elasticsearch/http/HttpTransportSettings.java b/core/src/main/java/org/elasticsearch/http/HttpTransportSettings.java index 146999240c3c2..315fa5b038bfd 100644 --- a/core/src/main/java/org/elasticsearch/http/HttpTransportSettings.java +++ b/core/src/main/java/org/elasticsearch/http/HttpTransportSettings.java @@ -95,6 +95,7 @@ public final class HttpTransportSettings { public static final Setting SETTING_HTTP_RESET_COOKIES = Setting.boolSetting("http.reset_cookies", false, Property.NodeScope); + // A default of 0 means that by default there is no read timeout public static final Setting SETTING_HTTP_READ_TIMEOUT = Setting.timeSetting("http.read_timeout", new TimeValue(0), new TimeValue(0), Property.NodeScope);