trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject [1/2] trafficserver git commit: TS-3312: KA timeout to origin does not seem to honor configurations
Date Thu, 12 Mar 2015 00:58:15 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 4361f4d0d -> b416a1dfa


TS-3312: KA timeout to origin does not seem to honor configurations


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9acfba0a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9acfba0a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9acfba0a

Branch: refs/heads/master
Commit: 9acfba0a911c374c5fb1c4171d0041ebeafd3f33
Parents: 4361f4d
Author: Dzmitry Markovich <dmarkovi@linkedin.com>
Authored: Wed Mar 11 17:57:41 2015 -0700
Committer: Brian Geffon <briang@apache.org>
Committed: Wed Mar 11 17:57:41 2015 -0700

----------------------------------------------------------------------
 proxy/http/HttpSessionManager.cc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9acfba0a/proxy/http/HttpSessionManager.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSessionManager.cc b/proxy/http/HttpSessionManager.cc
index 101955b..c650ab6 100644
--- a/proxy/http/HttpSessionManager.cc
+++ b/proxy/http/HttpSessionManager.cc
@@ -120,8 +120,14 @@ ServerSessionPool::releaseSession(HttpServerSession* ss)
   // Transfer control of the write side as well
   ss->do_io_write(this, 0, NULL);
 
-  // we probably don't need the active timeout set, but will leave it for now
-  ss->get_netvc()->set_inactivity_timeout(ss->get_netvc()->get_inactivity_timeout());
+  HttpConfigParams *http_config_params = HttpConfig::acquire();
+
+  // when placing the session to the shared pool we have to set the time out to
+  // keep_alive_no_activity_timeout_out and not to transaction_no_activity_timeout_out,
+  // since there is no transaction pending at this point.
+  // Once there is an active transaction on this connection, inactivity timeout will be
+  // overwritten to transaction_no_activity_timeout_out
+  ss->get_netvc()->set_inactivity_timeout(HRTIME_SECONDS(http_config_params->oride.keep_alive_no_activity_timeout_out));
   ss->get_netvc()->set_active_timeout(ss->get_netvc()->get_active_timeout());
   // put it in the pools.
   m_ip_pool.insert(ss);


Mime
View raw message