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

MXS-3106: Always write the final COM_QUIT

Browse Source 
This seems to help with a regression that was introduced in 2.4.11.
This commit is contained in:
Markus Mäkelä
2020-08-21 08:27:34 +03:00
parent b90d42b999
commit c5b47389df
5 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/core/dcb.cc
View File

@ -822,7 +822,7 @@ static int dcb_log_errors_SSL(DCB* dcb, int ret)
unsigned long ssl_errno;
ssl_errno = ERR_get_error();
if (0 == ssl_errno)
if (0 == ssl_errno || dcb->silence_write_errors)
{
return 0;
}
@ -1806,7 +1806,8 @@ static int gw_write(DCB* dcb, GWBUF* writeq, bool* stop_writing)
if (written < 0)
{
*stop_writing = true;
if (saved_errno != EAGAIN && saved_errno != EWOULDBLOCK && saved_errno != EPIPE)
if (saved_errno != EAGAIN && saved_errno != EWOULDBLOCK && saved_errno != EPIPE
&& !dcb->silence_write_errors)
{
MXS_ERROR("Write to %s %s in state %s failed: %d, %s",
dcb->type(),