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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Johan Wikman 2018-04-16 14:46:19 +03:00
commit fa3143cedf
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/dcb.cc
View File

@ -3456,6 +3456,18 @@ int poll_add_dcb(DCB *dcb)
new_state = DCB_STATE_LISTENING;
worker_id = MXS_WORKER_ALL;
}
else if (dcb->dcb_role == DCB_ROLE_CLIENT_HANDLER &&
(strcasecmp(dcb->service->routerModule, "cli") == 0))
{
// If the DCB refers to an accepted maxadmin socket, we force it
// to the main thread. That's done in order to prevent a deadlock
// that may happen if there are multiple concurrent maxadmin calls,
// handled by different worker threads.
// See: https://jira.mariadb.org/browse/MXS-1805
new_state = DCB_STATE_POLLING;
dcb->poll.thread.id = 0;
worker_id = dcb->poll.thread.id;
}
else
{
ss_dassert(dcb->dcb_role == DCB_ROLE_CLIENT_HANDLER ||