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

Process EPOLL[RD]HUP after EPOLLIN

Browse Source 
This allows COM_QUIT packets to be processed first in case a EPOLLIN and a
EPOLLRDHUP event arrive at the same time. This fixes the pers_01 test.
This commit is contained in:
Markus Mäkelä 2020-03-17 14:45:06 +02:00
parent 05f71424e8
commit 5984af468c
No known key found for this signature in database
GPG Key ID: 5CE746D557ACC499
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
server/core/dcb.cc
View File

@ -2653,6 +2653,12 @@ static uint32_t dcb_process_poll_events(DCB* dcb, uint32_t events)
/**
* Any of these callbacks might close the DCB. Hence, the value of 'n_close'
* must be checked after each callback invocation.
*
* The order in which the events are processed is meaningful and should not be changed. EPOLLERR is
* handled first to get the best possible error message in the log message in case EPOLLERR is returned
* with another event from epoll_wait. EPOLLOUT and EPOLLIN are processed before EPOLLHUP and EPOLLRDHUP
* so that all client events are processed in case EPOLLIN and EPOLLRDHUP events arrive in the same
* epoll_wait.
*/
if ((events & EPOLLERR) && (dcb->n_close == 0))
{
@ -2665,6 +2671,40 @@ static uint32_t dcb_process_poll_events(DCB* dcb, uint32_t events)
}
}
if ((events & EPOLLOUT) && (dcb->n_close == 0))
{
rc |= MXB_POLL_WRITE;
if (dcb_session_check(dcb, "write_ready"))
{
DCB_EH_NOTICE("Calling dcb->func.write_ready(%p)", dcb);
dcb->func.write_ready(dcb);
}
}
if ((events & EPOLLIN) && (dcb->n_close == 0))
{
rc |= MXB_POLL_READ;
if (dcb_session_check(dcb, "read"))
{
int return_code = 1;
/** SSL authentication is still going on, we need to call dcb_accept_SSL
* until it return 1 for success or -1 for error */
if (dcb->ssl_state == SSL_HANDSHAKE_REQUIRED)
{
return_code = (DCB::Role::CLIENT == dcb->role) ?
dcb_accept_SSL(dcb) :
dcb_connect_SSL(dcb);
}
if (1 == return_code)
{
DCB_EH_NOTICE("Calling dcb->func.read(%p)", dcb);
dcb->func.read(dcb);
}
}
}
if ((events & EPOLLHUP) && (dcb->n_close == 0))
{
rc |= MXB_POLL_HUP;
@ -2699,40 +2739,6 @@ static uint32_t dcb_process_poll_events(DCB* dcb, uint32_t events)
}
#endif
if ((events & EPOLLOUT) && (dcb->n_close == 0))
{
rc |= MXB_POLL_WRITE;
if (dcb_session_check(dcb, "write_ready"))
{
DCB_EH_NOTICE("Calling dcb->func.write_ready(%p)", dcb);
dcb->func.write_ready(dcb);
}
}
if ((events & EPOLLIN) && (dcb->n_close == 0))
{
rc |= MXB_POLL_READ;
if (dcb_session_check(dcb, "read"))
{
int return_code = 1;
/** SSL authentication is still going on, we need to call dcb_accept_SSL
* until it return 1 for success or -1 for error */
if (dcb->ssl_state == SSL_HANDSHAKE_REQUIRED)
{
return_code = (DCB::Role::CLIENT == dcb->role) ?
dcb_accept_SSL(dcb) :
dcb_connect_SSL(dcb);
}
if (1 == return_code)
{
DCB_EH_NOTICE("Calling dcb->func.read(%p)", dcb);
dcb->func.read(dcb);
}
}
}
return rc;
}