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

Fix test_poll failure

Browse Source 
With the changes to the DCB handling, the service pointer of a client DCB
must always be assigned.

Also removed the unnecessary parentheses around the comparison.
This commit is contained in:
Markus Mäkelä 2018-04-18 08:10:42 +03:00
parent ad15f4d4be
commit 474736584b
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/dcb.cc
View File

@ -3420,7 +3420,7 @@ 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)
{
// 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

4
server/core/test/test_poll.cc
View File

@ -52,6 +52,9 @@ test1()
int eno = 0;
SERV_LISTENER dummy;
SERVICE service;
service.routerModule = (char*)"required by a check in dcb.cc";
/* Poll tests */
ss_dfprintf(stderr,
"testpoll : Initialise the polling system.");
@ -66,6 +69,7 @@ test1()
}
dcb->fd = socket(AF_UNIX, SOCK_STREAM, 0);
dcb->service = &service;
if (dcb->fd < 0)
{