hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix max_connection for 2.4

Browse Source 
The merge from 2.3 caused the mechanism to break in 2.4 where the old code
was correct.
This commit is contained in:
Markus Mäkelä
2020-01-16 09:16:24 +02:00
parent a7e0142224
commit 60416f5b96
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/listener.cc
View File

@ -855,7 +855,7 @@ DCB* Listener::accept_one_dcb(int fd, const sockaddr_storage* addr, const char*
return NULL;
}
if (m_service->max_connections && m_service->client_count >= m_service->max_connections)
if (m_service->max_connections && m_service->client_count > m_service->max_connections)
{
// TODO: If connections can be queued, this is the place to put the
// TODO: connection on that queue.

12
server/core/session.cc
View File

@ -1134,6 +1134,7 @@ Session::Session(const SListener& listener)
mxb::atomic::add(&service->stats.n_current, 1, mxb::atomic::RELAXED);
mxb_assert(service->stats.n_current >= 0);
mxb::atomic::add(&service->client_count, 1, mxb::atomic::RELAXED);
}
Session::~Session()
@ -1151,6 +1152,17 @@ Session::~Session()
mxb::atomic::add(&service->stats.n_current, -1, mxb::atomic::RELAXED);
mxb_assert(service->stats.n_current >= 0);
bool should_destroy = !mxb::atomic::load(&service->active);
if (mxb::atomic::add(&service->client_count, -1) == 1 && should_destroy)
{
// Destroy the service in the main routing worker thread
auto svc = static_cast<Service*>(service);
mxs::RoutingWorker* main_worker = mxs::RoutingWorker::get(mxs::RoutingWorker::MAIN);
main_worker->execute([svc]() {
service_free(svc);
}, Worker::EXECUTE_AUTO);
}
}
void Session::set_client_dcb(DCB* dcb)