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

Fixed dcb_write failing when the cause was EAGAIN or EWOULDBLOCK.

Browse Source
This commit is contained in:
Markus Makela 2015-07-22 15:34:51 +03:00
parent 19d9c9982f
commit 7363343499
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/core/dcb.c
View File

@ -106,7 +106,7 @@ static inline bool dcb_write_parameter_check(DCB *dcb, GWBUF *queue);
static inline void dcb_write_fake_code(DCB *dcb);
#endif
static inline void dcb_write_when_already_queued(DCB *dcb, GWBUF *queue);
static void dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno);
static int dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno);
static inline void dcb_write_tidy_up(DCB *dcb, bool below_water);
static int dcb_write_SSL_error_report (DCB *dcb, int ret);
int session_unlink_dcb(SESSION*, DCB*);
@ -1148,7 +1148,8 @@ int below_water;
if (written < 0)
{
dcb_log_write_failure(dcb, queue, errno);
int rv = dcb_log_write_failure(dcb, queue, errno);
/*<
* What wasn't successfully written is stored to write queue
* for suspended write.
@ -1157,7 +1158,11 @@ int below_water;
dcb->writeq = queue;
dcb->stats.n_buffered++;
spinlock_release(&dcb->writeqlock);
return 0;
/** Return 1 if the write failure was due to EWOULDBLOCK or EAGAIN.
The rest of the buffer will be written once an EPOLL_OUT event
arrives.*/
return rv == 0 ? 1 : 0;
}
/*
* Pull the number of bytes we have written from
@ -1307,9 +1312,10 @@ dcb_write_when_already_queued(DCB *dcb, GWBUF *queue)
* @param queue Queue of buffers to write
* @param eno Error number for logging
*/
static void
static int
dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
{
int rval = 0;
if (LOG_IS_ENABLED(LOGFILE_DEBUG))
{
if (eno == EPIPE)
@ -1325,6 +1331,7 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
dcb->fd,
eno,
strerror(eno))));
rval = -1;
}
}
@ -1344,6 +1351,7 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
dcb->fd,
eno,
strerror(eno))));
rval = -1;
}
@ -1376,8 +1384,10 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
dcb_isclient(dcb) ? "client" : "backend server",
eno,
strerror(eno))));
rval = -1;
}
}
return rval;
}
/**

7
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -2493,8 +2493,8 @@ static bool route_single_stmt(
rses_end_locked_router_action(rses);
goto retblock;
}
if ((ret = target_dcb->func.write(target_dcb, gwbuf_clone(querybuf))) == 1)
GWBUF* wbuf = gwbuf_clone(querybuf);
if ((ret = target_dcb->func.write(target_dcb, wbuf)) == 1)
{
backend_ref_t* bref;
@ -2508,7 +2508,8 @@ static bool route_single_stmt(
}
else
{
LOGIF(LE, (skygw_log_write_flush(
gwbuf_free(wbuf);
LOGIF((LE|LT), (skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Routing query failed.")));
succp = false;