Skip to content

Fix session pool to add and fetch to beginning of hash chain instead of end #6805

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
Jun 9, 2020
Merged

Fix session pool to add and fetch to beginning of hash chain instead of end #6805

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
10 changes: 0 additions & 10 deletions include/tscore/IntrusiveHashMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,16 +539,6 @@ IntrusiveHashMap<H>::insert(value_type *v)
if (spot != bucket->_v) {
mixed_p = true; // found some other key, it's going to be mixed.
}
if (spot != limit) {
// If an equal key was found, walk past those to insert at the upper end of the range.
do {
spot = H::next_ptr(spot);
} while (spot != limit && H::equal(key, H::key_of(spot)));
if (spot != limit) { // something not equal past last equivalent, it's going to be mixed.
mixed_p = true;
}
}

_list.insert_before(spot, v);
if (spot == bucket->_v) { // added before the bucket start, update the start.
bucket->_v = v;
Expand Down
45 changes: 19 additions & 26 deletions proxy/http/HttpSessionManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,51 +150,44 @@ ServerSessionPool::acquireSession(sockaddr const *addr, CryptoHash const &hostna
// This is broken out because only in this case do we check the host hash first. The range must be checked
// to verify an upstream that matches port and SNI name is selected. Walk backwards to select oldest.
in_port_t port = ats_ip_port_cast(addr);
FQDNTable::iterator first, last;
// FreeBSD/clang++ bug workaround: explicit cast to super type to make overload work. Not needed on Fedora27 nor gcc.
// Not fixed on FreeBSD as of llvm 6.0.1.
std::tie(first, last) = static_cast<const decltype(m_fqdn_pool)::range::super_type &>(m_fqdn_pool.equal_range(hostname_hash));
while (last != first) {
--last;
if (port == ats_ip_port_cast(last->get_server_ip()) &&
(!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_SNI) || validate_sni(sm, last->get_netvc())) &&
(!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_HOSTSNISYNC) || validate_host_sni(sm, last->get_netvc())) &&
(!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_CERT) || validate_cert(sm, last->get_netvc()))) {
auto first = m_fqdn_pool.find(hostname_hash);
while (first != m_fqdn_pool.end() && first->hostname_hash == hostname_hash) {
if (port == ats_ip_port_cast(first->get_server_ip()) &&
(!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_SNI) || validate_sni(sm, first->get_netvc())) &&
(!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_HOSTSNISYNC) || validate_host_sni(sm, first->get_netvc())) &&
(!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_CERT) || validate_cert(sm, first->get_netvc()))) {
zret = HSM_DONE;
break;
}
++first;
}
if (zret == HSM_DONE) {
to_return = last;
m_fqdn_pool.erase(last);
to_return = first;
m_fqdn_pool.erase(first);
m_ip_pool.erase(to_return);
}
} else if (TS_SERVER_SESSION_SHARING_MATCH_MASK_IP & match_style) { // matching is not disabled.
IPTable::iterator first, last;
// FreeBSD/clang++ bug workaround: explicit cast to super type to make overload work. Not needed on Fedora27 nor gcc.
// Not fixed on FreeBSD as of llvm 6.0.1.
std::tie(first, last) = static_cast<const decltype(m_ip_pool)::range::super_type &>(m_ip_pool.equal_range(addr));
auto first = m_ip_pool.find(addr);
// The range is all that is needed in the match IP case, otherwise need to scan for matching fqdn
// And matches the other constraints as well
// Note the port is matched as part of the address key so it doesn't need to be checked again.
if (match_style & (~TS_SERVER_SESSION_SHARING_MATCH_MASK_IP)) {
while (last != first) {
--last;
if ((!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_HOSTONLY) || last->hostname_hash == hostname_hash) &&
(!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_SNI) || validate_sni(sm, last->get_netvc())) &&
(!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_HOSTSNISYNC) || validate_host_sni(sm, last->get_netvc())) &&
(!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_CERT) || validate_cert(sm, last->get_netvc()))) {
while (first != m_ip_pool.end() && ats_ip_addr_port_eq(first->get_server_ip(), addr)) {
if ((!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_HOSTONLY) || first->hostname_hash == hostname_hash) &&
(!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_SNI) || validate_sni(sm, first->get_netvc())) &&
(!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_HOSTSNISYNC) || validate_host_sni(sm, first->get_netvc())) &&
(!(match_style & TS_SERVER_SESSION_SHARING_MATCH_MASK_CERT) || validate_cert(sm, first->get_netvc()))) {
zret = HSM_DONE;
break;
}
++first;
}
} else if (last != first) {
--last;
} else if (first != m_ip_pool.end()) {
zret = HSM_DONE;
}
if (zret == HSM_DONE) {
to_return = last;
m_ip_pool.erase(last);
to_return = first;
m_ip_pool.erase(first);
m_fqdn_pool.erase(to_return);
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/tscore/unit_tests/test_IntrusiveHashMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ TEST_CASE("IntrusiveHashMap", "[libts][IntrusiveHashMap]")
auto r = map.equal_range("dup"sv);
REQUIRE(r.first != r.second);
REQUIRE(r.first->_payload == "dup"sv);
REQUIRE(r.first->_n == 79);
REQUIRE(r.first->_n == 81);

Map::iterator idx;

Expand All @@ -138,13 +138,13 @@ TEST_CASE("IntrusiveHashMap", "[libts][IntrusiveHashMap]")
REQUIRE(r.first != r.second);
idx = r.first;
REQUIRE(idx->_payload == "dup"sv);
REQUIRE(idx->_n == 79);
REQUIRE(idx->_n == 81);
REQUIRE((++idx)->_payload == "dup"sv);
REQUIRE(idx->_n != r.first->_n);
REQUIRE(idx->_n == 80);
REQUIRE(idx->_n == 79);
REQUIRE((++idx)->_payload == "dup"sv);
REQUIRE(idx->_n != r.first->_n);
REQUIRE(idx->_n == 81);
REQUIRE(idx->_n == 80);
REQUIRE(++idx == map.end());
// Verify only the "dup" items are left.
for (auto &&elt : map) {
Expand Down Expand Up @@ -200,7 +200,7 @@ TEST_CASE("IntrusiveHashMapManyStrings", "[IntrusiveHashMap]")
}
for (int idx = 23; idx < N; idx += 23) {
auto spot = ihm.find(strings[idx]);
if (spot == ihm.end() || spot->_n != idx || ++spot == ihm.end() || spot->_n != 2000 + idx) {
if (spot == ihm.end() || spot->_n != 2000 + idx || ++spot == ihm.end() || spot->_n != idx) {
miss_p = true;
}
}
Expand All @@ -213,7 +213,7 @@ TEST_CASE("IntrusiveHashMapManyStrings", "[IntrusiveHashMap]")
}
for (int idx = 31; idx < N; idx += 31) {
auto spot = ihm.find(strings[idx]);
if (spot == ihm.end() || spot->_n != idx || ++spot == ihm.end() || (idx != (23 * 31) && spot->_n != 3000 + idx) ||
if (spot == ihm.end() || spot->_n != 3000 + idx || ++spot == ihm.end() || (idx != (23 * 31) && spot->_n != idx) ||
(idx == (23 * 31) && spot->_n != 2000 + idx)) {
miss_p = true;
}
Expand Down