You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by vm...@apache.org on 2017/05/16 17:26:54 UTC
[trafficserver] branch master updated: remove the configuration to
enable or disable safe requests retry
This is an automated email from the ASF dual-hosted git repository.
vmamidi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new cacdb55 remove the configuration to enable or disable safe requests retry
cacdb55 is described below
commit cacdb5541c87f5ad83edd45ec888a4225d05c30a
Author: Vijay Mamidi <vi...@yahoo.com>
AuthorDate: Mon May 15 15:07:58 2017 -0400
remove the configuration to enable or disable safe requests retry
---
doc/admin-guide/files/records.config.en.rst | 13 -------------
.../api/functions/TSHttpOverridableConfig.en.rst | 1 -
lib/ts/apidefs.h.in | 1 -
mgmt/RecordsConfig.cc | 2 --
plugins/experimental/ts_lua/ts_lua_http_config.c | 2 --
proxy/InkAPI.cc | 5 -----
proxy/InkAPITest.cc | 1 -
proxy/http/HttpConfig.cc | 2 --
proxy/http/HttpConfig.h | 3 ---
proxy/http/HttpTransact.cc | 2 +-
10 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/doc/admin-guide/files/records.config.en.rst b/doc/admin-guide/files/records.config.en.rst
index b1dfed9..06a311d 100644
--- a/doc/admin-guide/files/records.config.en.rst
+++ b/doc/admin-guide/files/records.config.en.rst
@@ -1091,19 +1091,6 @@ ip-resolve
according to this setting then it will be used, otherwise it will be released to the pool and a different session
selected or created.
-.. ts:cv:: CONFIG proxy.config.http.safe_requests_retryable INT 1
- :overridable:
-
- This setting, on by default, allows requests which are considered safe to be retried on an error.
- See https://tools.ietf.org/html/rfc7231#section-4.2.1 to RFC for details on which request methods are considered safe.
-
- If this setting is ``0`` then ATS retries a failed origin server request only if the bytes sent by ATS
- are not acknowledged by the origin server.
-
- If this setting is ``1`` then ATS retries all the safe methods to a failed origin server irrespective of
- previous connection failure status.
-
-
.. ts:cv:: CONFIG proxy.config.http.record_heartbeat INT 0
:reloadable:
diff --git a/doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst b/doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst
index 0f16897..0f9e0a8 100644
--- a/doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst
+++ b/doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst
@@ -73,7 +73,6 @@ c:member:`TS_CONFIG_HTTP_ANONYMIZE_REMOVE_FROM` :ts:cv:`prox
c:member:`TS_CONFIG_HTTP_ANONYMIZE_REMOVE_REFERER` :ts:cv:`proxy.config.http.anonymize_remove_referer`
c:member:`TS_CONFIG_HTTP_ANONYMIZE_REMOVE_USER_AGENT` :ts:cv:`proxy.config.http.anonymize_remove_user_agent`
c:member:`TS_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT` :ts:cv:`proxy.config.http.attach_server_session_to_client`
-c:member:`TS_CONFIG_HTTP_SAFE_REQUESTS_RETRYABLE` :ts:cv:`proxy.config.http.safe_requests_retryable`
c:member:`TS_CONFIG_HTTP_AUTH_SERVER_SESSION_PRIVATE` :ts:cv:`proxy.config.http.auth_server_session_private`
c:member:`TS_CONFIG_HTTP_BACKGROUND_FILL_ACTIVE_TIMEOUT` :ts:cv:`proxy.config.http.background_fill_active_timeout`
c:member:`TS_CONFIG_HTTP_BACKGROUND_FILL_COMPLETED_THRESHOLD` :ts:cv:`proxy.config.http.background_fill_completed_threshold`
diff --git a/lib/ts/apidefs.h.in b/lib/ts/apidefs.h.in
index 87c77a6..a06b6cd 100644
--- a/lib/ts/apidefs.h.in
+++ b/lib/ts/apidefs.h.in
@@ -731,7 +731,6 @@ typedef enum {
TS_CONFIG_HTTP_CACHE_MAX_OPEN_WRITE_RETRIES,
TS_CONFIG_HTTP_REDIRECT_USE_ORIG_CACHE_KEY,
TS_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT,
- TS_CONFIG_HTTP_SAFE_REQUESTS_RETRYABLE,
TS_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE,
TS_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT,
TS_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT,
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 4b2f23e..9e4b86f 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -443,8 +443,6 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.http.attach_server_session_to_client", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.safe_requests_retryable", RECD_INT, "1", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.net.max_connections_in", RECD_INT, "30000", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.net.max_connections_active_in", RECD_INT, "10000", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
diff --git a/plugins/experimental/ts_lua/ts_lua_http_config.c b/plugins/experimental/ts_lua/ts_lua_http_config.c
index 435fc75..7931033 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_config.c
+++ b/plugins/experimental/ts_lua/ts_lua_http_config.c
@@ -108,7 +108,6 @@ typedef enum {
TS_LUA_CONFIG_HTTP_CACHE_MAX_OPEN_WRITE_RETRIES = TS_CONFIG_HTTP_CACHE_MAX_OPEN_WRITE_RETRIES,
TS_LUA_CONFIG_HTTP_REDIRECT_USE_ORIG_CACHE_KEY = TS_CONFIG_HTTP_REDIRECT_USE_ORIG_CACHE_KEY,
TS_LUA_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT = TS_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT,
- TS_LUA_CONFIG_HTTP_SAFE_REQUESTS_RETRYABLE = TS_CONFIG_HTTP_SAFE_REQUESTS_RETRYABLE,
TS_LUA_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE = TS_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE,
TS_LUA_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT = TS_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT,
TS_LUA_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT = TS_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT,
@@ -228,7 +227,6 @@ ts_lua_var_item ts_lua_http_config_vars[] = {
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_MAX_OPEN_WRITE_RETRIES),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_REDIRECT_USE_ORIG_CACHE_KEY),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_SAFE_REQUESTS_RETRYABLE),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT),
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 118e7c2..f841281 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -8046,9 +8046,6 @@ _conf_to_memberp(TSOverridableConfigKey conf, OverridableHttpConfigParams *overr
case TS_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT:
ret = _memberp_to_generic(&overridableHttpConfig->attach_server_session_to_client, typep);
break;
- case TS_CONFIG_HTTP_SAFE_REQUESTS_RETRYABLE:
- ret = _memberp_to_generic(&overridableHttpConfig->safe_requests_retryable, typep);
- break;
case TS_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE:
ret = _memberp_to_generic(&overridableHttpConfig->origin_max_connections_queue, typep);
break;
@@ -8520,8 +8517,6 @@ TSHttpTxnConfigFind(const char *name, int length, TSOverridableConfigKey *conf,
cnf = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE;
} else if (!strncmp(name, "proxy.config.http.request_header_max_size", length)) {
cnf = TS_CONFIG_HTTP_REQUEST_HEADER_MAX_SIZE;
- } else if (!strncmp(name, "proxy.config.http.safe_requests_retryable", length)) {
- cnf = TS_CONFIG_HTTP_SAFE_REQUESTS_RETRYABLE;
}
break;
case 'r':
diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index 47f34ce..d8e3a9c 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -7612,7 +7612,6 @@ const char *SDK_Overridable_Configs[TS_CONFIG_LAST_ENTRY] = {
"proxy.config.http.cache.max_open_write_retries",
"proxy.config.http.redirect_use_orig_cache_key",
"proxy.config.http.attach_server_session_to_client",
- "proxy.config.http.safe_requests_retryable",
"proxy.config.http.origin_max_connections_queue",
"proxy.config.websocket.no_activity_timeout",
"proxy.config.websocket.active_timeout",
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index ed546e3..062bdd4 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -897,7 +897,6 @@ HttpConfig::startup()
HttpEstablishStaticConfigLongLong(c.oride.origin_max_connections_queue, "proxy.config.http.origin_max_connections_queue");
HttpEstablishStaticConfigLongLong(c.origin_min_keep_alive_connections, "proxy.config.http.origin_min_keep_alive_connections");
HttpEstablishStaticConfigByte(c.oride.attach_server_session_to_client, "proxy.config.http.attach_server_session_to_client");
- HttpEstablishStaticConfigByte(c.oride.safe_requests_retryable, "proxy.config.http.safe_requests_retryable");
HttpEstablishStaticConfigByte(c.disable_ssl_parenting, "proxy.local.http.parent_proxy.disable_connect_tunneling");
HttpEstablishStaticConfigByte(c.oride.forward_connect_method, "proxy.config.http.forward_connect_method");
@@ -1170,7 +1169,6 @@ HttpConfig::reconfigure()
}
params->origin_min_keep_alive_connections = m_master.origin_min_keep_alive_connections;
params->oride.attach_server_session_to_client = m_master.oride.attach_server_session_to_client;
- params->oride.safe_requests_retryable = m_master.oride.safe_requests_retryable;
if (params->oride.origin_max_connections && params->oride.origin_max_connections < params->origin_min_keep_alive_connections) {
Warning("origin_max_connections < origin_min_keep_alive_connections, setting min=max , please correct your records.config");
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 52f0a0f..85ccca2 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -377,7 +377,6 @@ struct OverridableHttpConfigParams {
fwd_proxy_auth_to_parent(0),
uncacheable_requests_bypass_parent(1),
attach_server_session_to_client(0),
- safe_requests_retryable(1),
forward_connect_method(0),
insert_age_in_response(1),
anonymize_remove_from(0),
@@ -503,8 +502,6 @@ struct OverridableHttpConfigParams {
MgmtByte uncacheable_requests_bypass_parent;
MgmtByte attach_server_session_to_client;
- MgmtByte safe_requests_retryable;
-
MgmtByte forward_connect_method;
MgmtByte insert_age_in_response;
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index a333bd2..a388b54 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -6320,7 +6320,7 @@ HttpTransact::is_request_retryable(State *s)
// If safe requests are retryable, it should be safe to retry safe requests irrespective of bytes sent or connection state
// according to RFC the following methods are safe (https://tools.ietf.org/html/rfc7231#section-4.2.1)
// If there was no error establishing the connection (and we sent bytes)-- we cannot retry
- if (!(s->txn_conf->safe_requests_retryable && HttpTransactHeaders::is_method_safe(s->method)) &&
+ if (!HttpTransactHeaders::is_method_safe(s->method) &&
(s->current.state != CONNECTION_ERROR && s->state_machine->server_request_hdr_bytes > 0 &&
s->state_machine->get_server_session()->get_netvc()->outstanding() != s->state_machine->server_request_hdr_bytes)) {
return false;
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].