Skip to content

Cancel active timeout when releasing session #8083

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
shinrich merged 1 commit into from
Jul 30, 2021
Merged

Cancel active timeout when releasing session #8083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions proxy/http/Http1ServerSession.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,11 @@ Http1ServerSession::release(ProxyTransaction *trans)
Debug("http_ss", "[%" PRId64 "] Releasing session, private_session=%d, sharing_match=%d", con_id, this->is_private(),
sharing_match);
if (state == SSN_IN_USE) {
// The caller should have already set the inactive timeout to the keep alive timeout
// Unfortunately, we do not have access to that value from here.
// However we can clear the active timeout here. The active timeout makes no sense
// in the keep alive state
cancel_active_timeout();
state = SSN_TO_RELEASE;
return;
}
Expand Down
17 changes: 6 additions & 11 deletions proxy/http/HttpSessionManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,9 @@ ServerSessionPool::releaseSession(PoolableSession *ss)
// Transfer control of the write side as well
ss->do_io_write(this, 0, nullptr);

// we probably don't need the active timeout set, but will leave it for now
HttpConfigParams *http_config_params = HttpConfig::acquire();
ss->set_inactivity_timeout(HRTIME_SECONDS(http_config_params->oride.keep_alive_no_activity_timeout_out));
ss->set_active_timeout(HRTIME_SECONDS(http_config_params->oride.keep_alive_no_activity_timeout_out));
HttpConfig::release(http_config_params);
ss->set_inactivity_timeout(ss->get_netvc()->get_inactivity_timeout());
ss->cancel_active_timeout();

// put it in the pools.
this->addSession(ss);

Expand Down Expand Up @@ -251,9 +249,8 @@ ServerSessionPool::eventHandler(int event, void *data)
return 0;
}

sockaddr const *addr = net_vc->get_remote_addr();
HttpConfigParams *http_config_params = HttpConfig::acquire();
bool found = false;
sockaddr const *addr = net_vc->get_remote_addr();
bool found = false;

for (auto spot = m_ip_pool.find(addr); spot != m_ip_pool.end() && spot->_ip_link.equal(addr, spot); ++spot) {
if ((s = spot)->get_netvc() == net_vc) {
Expand All @@ -271,8 +268,7 @@ ServerSessionPool::eventHandler(int event, void *data)
"[%" PRId64 "] [session_bucket] session received io notice [%s], "
"resetting timeout to maintain minimum number of connections",
s->connection_id(), HttpDebugNames::get_event_name(event));
s->get_netvc()->set_inactivity_timeout(HRTIME_SECONDS(http_config_params->oride.keep_alive_no_activity_timeout_out));
s->get_netvc()->set_active_timeout(HRTIME_SECONDS(http_config_params->oride.keep_alive_no_activity_timeout_out));
s->get_netvc()->set_inactivity_timeout(s->get_netvc()->get_inactivity_timeout());
found = true;
break;
}
Expand All @@ -292,7 +288,6 @@ ServerSessionPool::eventHandler(int event, void *data)
}
}

HttpConfig::release(http_config_params);
if (!found) {
// We failed to find our session. This can only be the result of a programming flaw. Since we only ever keep
// UnixNetVConnections and SSLNetVConnections in the session pool, the dynamic cast won't fail.
Expand Down