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:
Markus Mäkelä
2018-04-30 12:38:19 +03:00
parent 2f8bb71a58 1e700ab9ba
commit 490d8c0963
10 changed files with 93 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/core/dcb.cc
View File

@ -3458,13 +3458,14 @@ int poll_add_dcb(DCB *dcb)
worker_id = MXS_WORKER_ALL;
}
else if (dcb->dcb_role == DCB_ROLE_CLIENT_HANDLER &&
strcasecmp(dcb->service->routerModule, "cli") == 0)
(strcasecmp(dcb->service->routerModule, "cli") == 0 ||
strcasecmp(dcb->service->routerModule, "maxinfo") == 0))
{
// If the DCB refers to an accepted maxadmin socket, we force it
// If the DCB refers to an accepted maxadmin/maxinfo 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,
// that may happen if there are multiple concurrent administrative calls,
// handled by different worker threads.
// See: https://jira.mariadb.org/browse/MXS-1805
// See: https://jira.mariadb.org/browse/MXS-1805 and https://jira.mariadb.org/browse/MXS-1833
new_state = DCB_STATE_POLLING;
dcb->poll.thread.id = 0;
worker_id = dcb->poll.thread.id;