You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/09/10 17:09:28 UTC
[02/48] git commit: TS-2107 Revert this change,
please review for correctness
TS-2107 Revert this change, please review for correctness
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c05a0979
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c05a0979
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c05a0979
Branch: refs/heads/5.0.x
Commit: c05a09799488bd91a9d6186535bf2f2796c5877d
Parents: d35e0e9
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed Sep 4 07:36:40 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Sep 4 07:36:40 2013 -0600
----------------------------------------------------------------------
CHANGES | 4 ----
mgmt/RecordsConfig.cc | 4 +---
mgmt/cli/ConfigCmd.cc | 9 ++++-----
mgmt/cli/ConfigCmd.h | 3 +--
mgmt/cli/ShowCmd.cc | 9 +++------
mgmt/cli/cli_detailed_command_list.txt | 6 ++----
proxy/http/HttpConfig.cc | 8 ++------
proxy/http/HttpConfig.h | 9 ++-------
proxy/http/HttpSM.cc | 27 ++-------------------------
9 files changed, 17 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c05a0979/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index aee6325..2a8e2b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,10 +29,6 @@ Changes with Apache Traffic Server 4.1.0
*) [TS-2147] Set server_share_sessions to 1 for 'internal' transactions in
rfc5861 plugin.
- *) [TS-2107] split proxy.config.http.transaction_active_timeout_in to
- proxy.config.http.transaction_header_timeout_in and
- proxy.config.http.transaction_request_timeout_in.
-
*) [TS-2114] buffer_upload plugin defines true and false
Author: Kit Chan <ch...@gmail.com>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c05a0979/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index da8e36e..3f7661d 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -508,9 +508,7 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.http.transaction_no_activity_timeout_out", RECD_INT, "30", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.transaction_header_active_timeout_in", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.http.transaction_request_active_timeout_in", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.http.transaction_active_timeout_in", RECD_INT, "900", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.http.transaction_active_timeout_out", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c05a0979/mgmt/cli/ConfigCmd.cc
----------------------------------------------------------------------
diff --git a/mgmt/cli/ConfigCmd.cc b/mgmt/cli/ConfigCmd.cc
index ae7a5c5..a40da20 100644
--- a/mgmt/cli/ConfigCmd.cc
+++ b/mgmt/cli/ConfigCmd.cc
@@ -978,11 +978,8 @@ Cmd_ConfigHttp(ClientData clientData, Tcl_Interp * interp, int argc, const char
case CMD_CONFIG_HTTP_INACTIVE_TIMEOUT_OUT:
return (Cli_RecordInt_Action(action, "proxy.config.http.transaction_no_activity_timeout_out", argtable->arg_int));
- case CMD_CONFIG_HTTP_HEADER_ACTIVE_TIMEOUT_IN:
- return (Cli_RecordInt_Action(action, "proxy.config.http.transaction_header_active_timeout_in", argtable->arg_int));
-
- case CMD_CONFIG_HTTP_REQUEST_ACTIVE_TIMEOUT_IN:
- return (Cli_RecordInt_Action(action, "proxy.config.http.transaction_request_active_timeout_in", argtable->arg_int));
+ case CMD_CONFIG_HTTP_ACTIVE_TIMEOUT_IN:
+ return (Cli_RecordInt_Action(action, "proxy.config.http.transaction_active_timeout_in", argtable->arg_int));
case CMD_CONFIG_HTTP_ACTIVE_TIMEOUT_OUT:
return (Cli_RecordInt_Action(action, "proxy.config.http.transaction_active_timeout_out", argtable->arg_int));
@@ -1042,6 +1039,8 @@ CmdArgs_ConfigHttp()
createArgument("inactive-timeout-out", 1, CLI_ARGV_OPTION_INT_VALUE,
(char *) NULL, CMD_CONFIG_HTTP_INACTIVE_TIMEOUT_OUT, "Inactive timeout outbound <seconds>",
(char *) NULL);
+ createArgument("active-timeout-in", 1, CLI_ARGV_OPTION_INT_VALUE,
+ (char *) NULL, CMD_CONFIG_HTTP_ACTIVE_TIMEOUT_IN, "Active timeout inbound <seconds>", (char *) NULL);
createArgument("active-timeout-out", 1, CLI_ARGV_OPTION_INT_VALUE,
(char *) NULL, CMD_CONFIG_HTTP_ACTIVE_TIMEOUT_OUT, "Active timeout outbound <seconds>", (char *) NULL);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c05a0979/mgmt/cli/ConfigCmd.h
----------------------------------------------------------------------
diff --git a/mgmt/cli/ConfigCmd.h b/mgmt/cli/ConfigCmd.h
index 05473c4..42ed681 100644
--- a/mgmt/cli/ConfigCmd.h
+++ b/mgmt/cli/ConfigCmd.h
@@ -113,8 +113,7 @@ typedef enum
CMD_CONFIG_HTTP_KEEP_ALIVE_TIMEOUT_OUT,
CMD_CONFIG_HTTP_INACTIVE_TIMEOUT_IN,
CMD_CONFIG_HTTP_INACTIVE_TIMEOUT_OUT,
- CMD_CONFIG_HTTP_HEADER_ACTIVE_TIMEOUT_IN,
- CMD_CONFIG_HTTP_REQUEST_ACTIVE_TIMEOUT_IN,
+ CMD_CONFIG_HTTP_ACTIVE_TIMEOUT_IN,
CMD_CONFIG_HTTP_ACTIVE_TIMEOUT_OUT,
CMD_CONFIG_HTTP_REMOVE_FROM,
CMD_CONFIG_HTTP_REMOVE_REFERER,
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c05a0979/mgmt/cli/ShowCmd.cc
----------------------------------------------------------------------
diff --git a/mgmt/cli/ShowCmd.cc b/mgmt/cli/ShowCmd.cc
index 138e8cb..ed71560 100644
--- a/mgmt/cli/ShowCmd.cc
+++ b/mgmt/cli/ShowCmd.cc
@@ -1155,8 +1155,7 @@ ShowHttp()
TSInt keepalive_timeout_out = -1;
TSInt inactivity_timeout_in = -1;
TSInt inactivity_timeout_out = -1;
- TSInt header_activity_timeout_in = -1;
- TSInt request_activity_timeout_in = -1;
+ TSInt activity_timeout_in = -1;
TSInt activity_timeout_out = -1;
TSInt max_alts = -1;
TSInt remove_from = -1;
@@ -1177,8 +1176,7 @@ ShowHttp()
Cli_RecordGetInt("proxy.config.http.keep_alive_no_activity_timeout_out", &keepalive_timeout_out);
Cli_RecordGetInt("proxy.config.http.transaction_no_activity_timeout_in", &inactivity_timeout_in);
Cli_RecordGetInt("proxy.config.http.transaction_no_activity_timeout_out", &inactivity_timeout_out);
- Cli_RecordGetInt("proxy.config.http.transaction_header_active_timeout_in", &header_activity_timeout_in);
- Cli_RecordGetInt("proxy.config.http.transaction_request_active_timeout_in", &request_activity_timeout_in);
+ Cli_RecordGetInt("proxy.config.http.transaction_active_timeout_in", &activity_timeout_in);
Cli_RecordGetInt("proxy.config.http.transaction_active_timeout_out", &activity_timeout_out);
Cli_RecordGetInt("proxy.config.cache.limits.http.max_alts", &max_alts);
Cli_RecordGetInt("proxy.config.http.anonymize_remove_from", &remove_from);
@@ -1201,8 +1199,7 @@ ShowHttp()
Cli_Printf("Keep-Alive Timeout Outbound --- %d s\n", keepalive_timeout_out);
Cli_Printf("Inactivity Timeout Inbound ---- %d s\n", inactivity_timeout_in);
Cli_Printf("Inactivity Timeout Outbound --- %d s\n", inactivity_timeout_out);
- Cli_Printf("Header Activity Timeout Inbound ------ %d s\n", header_activity_timeout_in);
- Cli_Printf("Request Activity Timeout Inbound ------ %d s\n", request_activity_timeout_in);
+ Cli_Printf("Activity Timeout Inbound ------ %d s\n", activity_timeout_in);
Cli_Printf("Activity Timeout Outbound ----- %d s\n", activity_timeout_out);
Cli_Printf("Maximum Number of Alternates -- %d\n", max_alts);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c05a0979/mgmt/cli/cli_detailed_command_list.txt
----------------------------------------------------------------------
diff --git a/mgmt/cli/cli_detailed_command_list.txt b/mgmt/cli/cli_detailed_command_list.txt
index 670be8c..54b2776 100644
--- a/mgmt/cli/cli_detailed_command_list.txt
+++ b/mgmt/cli/cli_detailed_command_list.txt
@@ -362,8 +362,7 @@ http HTTP Configuration
Keep-Alive Timeout Outbound --- 10 s (proxy.config.http.keep_alive_no_activity_timeout_out)
Inactivity Timeout Inbound ---- 120 s (proxy.config.http.transaction_no_activity_timeout_in)
Inactivity Timeout Outbound --- 120 s (proxy.config.http.transaction_no_activity_timeout_out)
- Header Activity Timeout Inbound ------ 7200 s (proxy.config.http.transaction_header_active_timeout_in)
- Request Activity Timeout Inbound ------ 7200 s (proxy.config.http.transaction_request_active_timeout_in)
+ Activity Timeout Inbound ------ 7200 s (proxy.config.http.transaction_active_timeout_in)
Activity Timeout Outbound ----- 7200 s (proxy.config.http.transaction_active_timeout_out)
Maximum Number of Alternates -- 3 (proxy.config.cache.limits.http.max_alts)
Remove the following common headers
@@ -966,8 +965,7 @@ http HTTP Configuration
keep-alive-timeout-out (proxy.config.http.keep_alive_no_activity_timeout_out)
inactive-timeout-in (proxy.config.http.transaction_no_activity_timeout_in)
inactive-timeout-out (proxy.config.http.transaction_no_activity_timeout_out)
- header-active-timeout-in (proxy.config.http.transaction_header_active_timeout_in)
- request-active-timeout-in (proxy.config.http.transaction_request_active_timeout_in)
+ active-timeout-in (proxy.config.http.transaction_active_timeout_in)
active-timeout-out (proxy.config.http.transaction_active_timeout_out)
ts# config:http keep-alive-timeout-in 10
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c05a0979/proxy/http/HttpConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index 14cbf1e..461a9b7 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -1190,10 +1190,7 @@ HttpConfig::startup()
"proxy.config.http.transaction_no_activity_timeout_in");
HttpEstablishStaticConfigLongLong(c.oride.transaction_no_activity_timeout_out,
"proxy.config.http.transaction_no_activity_timeout_out");
- HttpEstablishStaticConfigLongLong(c.transaction_header_active_timeout_in, "proxy.config.http.transaction_header_active_timeout_in");
- HttpEstablishStaticConfigLongLong(c.transaction_request_active_timeout_in, "proxy.config.http.transaction_request_active_timeout_in");
- if (c.transaction_header_active_timeout_in >= c.transaction_request_active_timeout_in)
- c.transaction_request_active_timeout_in = 0;
+ HttpEstablishStaticConfigLongLong(c.transaction_active_timeout_in, "proxy.config.http.transaction_active_timeout_in");
HttpEstablishStaticConfigLongLong(c.oride.transaction_active_timeout_out, "proxy.config.http.transaction_active_timeout_out");
HttpEstablishStaticConfigLongLong(c.accept_no_activity_timeout, "proxy.config.http.accept_no_activity_timeout");
@@ -1464,8 +1461,7 @@ HttpConfig::reconfigure()
params->oride.keep_alive_no_activity_timeout_out = m_master.oride.keep_alive_no_activity_timeout_out;
params->oride.transaction_no_activity_timeout_in = m_master.oride.transaction_no_activity_timeout_in;
params->oride.transaction_no_activity_timeout_out = m_master.oride.transaction_no_activity_timeout_out;
- params->oride.transaction_header_active_timeout_in = m_master.oride.transaction_header_active_timeout_in;
- params->oride.transaction_request_active_timeout_in = m_master.oride.transaction_request_active_timeout_in;
+ params->transaction_active_timeout_in = m_master.transaction_active_timeout_in;
params->oride.transaction_active_timeout_out = m_master.oride.transaction_active_timeout_out;
params->accept_no_activity_timeout = m_master.accept_no_activity_timeout;
params->oride.background_fill_active_timeout = m_master.oride.background_fill_active_timeout;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c05a0979/proxy/http/HttpConfig.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 04e14cb..c220463 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -420,7 +420,6 @@ struct OverridableHttpConfigParams {
cache_guaranteed_min_lifetime(0), cache_guaranteed_max_lifetime(31536000), cache_max_stale_age(604800),
keep_alive_no_activity_timeout_in(115), keep_alive_no_activity_timeout_out(120),
transaction_no_activity_timeout_in(30), transaction_no_activity_timeout_out(30),
- transaction_header_active_timeout_in(0), transaction_request_active_timeout_in(0),
transaction_active_timeout_out(0), origin_max_connections(0),
connect_attempts_max_retries(0), connect_attempts_max_retries_dead_server(3),
connect_attempts_rr_retries(3), connect_attempts_timeout(30),
@@ -559,8 +558,6 @@ struct OverridableHttpConfigParams {
MgmtInt keep_alive_no_activity_timeout_out;
MgmtInt transaction_no_activity_timeout_in;
MgmtInt transaction_no_activity_timeout_out;
- MgmtInt transaction_header_active_timeout_in;
- MgmtInt transaction_request_active_timeout_in;
MgmtInt transaction_active_timeout_out;
MgmtInt origin_max_connections;
@@ -672,8 +669,7 @@ public:
MgmtByte session_auth_cache_keep_alive_enabled;
MgmtInt origin_server_pipeline;
MgmtInt user_agent_pipeline;
- MgmtInt transaction_header_active_timeout_in;
- MgmtInt transaction_request_active_timeout_in;
+ MgmtInt transaction_active_timeout_in;
MgmtInt accept_no_activity_timeout;
////////////////////////////////////
@@ -906,8 +902,7 @@ HttpConfigParams::HttpConfigParams()
session_auth_cache_keep_alive_enabled(1),
origin_server_pipeline(1),
user_agent_pipeline(8),
- transaction_header_active_timeout_in(0),
- transaction_request_active_timeout_in(0),
+ transaction_active_timeout_in(900),
accept_no_activity_timeout(120),
parent_connect_attempts(4),
per_parent_connect_attempts(2),
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c05a0979/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index ce4f8b2..3804c50 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -636,11 +636,8 @@ HttpSM::attach_client_session(HttpClientSession * client_vc, IOBufferReader * bu
// set up timeouts //
/////////////////////////
client_vc->get_netvc()->set_inactivity_timeout(HRTIME_SECONDS(HttpConfig::m_master.accept_no_activity_timeout));
- if (HttpConfig::m_master.transaction_header_active_timeout_in)
- client_vc->get_netvc()->set_active_timeout(HRTIME_SECONDS(HttpConfig::m_master.transaction_header_active_timeout_in));
- else if (HttpConfig::m_master.transaction_request_active_timeout_in)
- client_vc->get_netvc()->set_active_timeout(HRTIME_SECONDS(HttpConfig::m_master.transaction_request_active_timeout_in));
-
+ client_vc->get_netvc()->set_active_timeout(HRTIME_SECONDS(HttpConfig::m_master.transaction_active_timeout_in));
+
// Add our state sm to the sm list
state_add_to_list(EVENT_NONE, NULL);
}
@@ -761,7 +758,6 @@ HttpSM::state_read_client_request_header(int event, void *data)
milestones.ua_read_header_done = ink_get_hrtime();
}
- int method;
switch (state) {
case PARSE_ERROR:
DebugSM("http", "[%" PRId64 "] error parsing client request header", sm_id);
@@ -769,7 +765,6 @@ HttpSM::state_read_client_request_header(int event, void *data)
// Disable further I/O on the client
ua_entry->read_vio->nbytes = ua_entry->read_vio->ndone;
- ua_session->get_netvc()->cancel_active_timeout();
call_transact_and_set_next_state(HttpTransact::BadRequest);
break;
@@ -781,7 +776,6 @@ HttpSM::state_read_client_request_header(int event, void *data)
// Disable further I/O on the client
ua_entry->read_vio->nbytes = ua_entry->read_vio->ndone;
- ua_session->get_netvc()->cancel_active_timeout();
call_transact_and_set_next_state(HttpTransact::BadRequest);
break;
} else if (event == VC_EVENT_READ_COMPLETE) {
@@ -825,21 +819,6 @@ HttpSM::state_read_client_request_header(int event, void *data)
(t_state.method == HTTP_WKSIDX_POST && HttpConfig::m_master.post_copy_size))
enable_redirection = HttpConfig::m_master.redirection_enabled;
- method = t_state.hdr_info.client_request.method_get_wksidx();
- if ((method == HTTP_WKSIDX_POST || method == HTTP_WKSIDX_PUT || (t_state.hdr_info.extension_method && t_state.hdr_info.request_content_length > 0))) {
- // is setted HttpConfig::m_master.transaction_header_active_timeout_in, so should reset active_timeout_in
- if (ua_session->get_netvc()->get_active_timeout() == HRTIME_SECONDS(HttpConfig::m_master.transaction_header_active_timeout_in)) {
- if (HttpConfig::m_master.transaction_request_active_timeout_in) {
- if (HRTIME_SECONDS(HttpConfig::m_master.transaction_request_active_timeout_in) > (milestones.ua_read_header_done - milestones.sm_start)) {
- ua_session->get_netvc()->set_active_timeout(HRTIME_SECONDS(HttpConfig::m_master.transaction_request_active_timeout_in) - (milestones.ua_read_header_done - milestones.sm_start));
- }
- } else {
- ua_session->get_netvc()->cancel_active_timeout();
- }
- }
- } else {
- ua_session->get_netvc()->cancel_active_timeout();
- }
call_transact_and_set_next_state(HttpTransact::ModifyRequest);
break;
@@ -3316,7 +3295,6 @@ HttpSM::tunnel_handler_post_ua(int event, HttpTunnelProducer * p)
case VC_EVENT_ACTIVE_TIMEOUT:
// Did not complete post tunnling. Abort the
// server and close the ua
- ua_session->get_netvc()->cancel_active_timeout();
p->handler_state = HTTP_SM_POST_UA_FAIL;
tunnel.chain_abort_all(p);
p->read_vio = NULL;
@@ -3346,7 +3324,6 @@ HttpSM::tunnel_handler_post_ua(int event, HttpTunnelProducer * p)
p->handler_state = HTTP_SM_POST_SUCCESS;
p->read_success = true;
ua_entry->in_tunnel = false;
- ua_session->get_netvc()->cancel_active_timeout();
if (p->do_dechunking || p->do_chunked_passthru) {
if (p->chunked_handler.truncation) {