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

MXS-2860: Update last_read only on successful reads

Browse Source 
This prevents empty or failed reads from updating the last_read flag which
in turn gives us the correct connection idle time when network errors
occur.
This commit is contained in:
Markus Mäkelä 2020-02-06 10:09:39 +02:00
parent 98e6bdcd90
commit 39cf6a8000
No known key found for this signature in database
GPG Key ID: 5CE746D557ACC499
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/dcb.cc
View File

@ -635,11 +635,11 @@ int dcb_read(DCB* dcb,
else
{
GWBUF* buffer;
dcb->last_read = mxs_clock();
buffer = dcb_basic_read(dcb, bytes_available, maxbytes, nreadtotal, &nsingleread);
if (buffer)
{
dcb->last_read = mxs_clock();
nreadtotal += nsingleread;
MXS_DEBUG("Read %d bytes from dcb %p in state %s fd %d.",
nsingleread,
@ -789,19 +789,19 @@ static int dcb_read_SSL(DCB* dcb, GWBUF** head)
dcb_drain_writeq(dcb);
}
dcb->last_read = mxs_clock();
buffer = dcb_basic_read_SSL(dcb, &nsingleread);
if (buffer)
{
dcb->last_read = mxs_clock();
nreadtotal += nsingleread;
*head = gwbuf_append(*head, buffer);
while (buffer)
{
dcb->last_read = mxs_clock();
buffer = dcb_basic_read_SSL(dcb, &nsingleread);
if (buffer)
{
dcb->last_read = mxs_clock();
nreadtotal += nsingleread;
/*< Append read data to the gwbuf */
*head = gwbuf_append(*head, buffer);