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

dcb.c

Browse Source 
dcb_write earlier returned an error (== 0) if errno was not set and other conditions were satisfied. In practice, if write was done in write queue, queue pointer was not updated and dcb_write returned and error. Changed the error detection condition so that it requires errno being set, at least.

readwritesplit.c
	Clean up.
This commit is contained in:
vraatikka
2013-10-16 08:29:22 +03:00
parent 4db366290d
commit 94c37799b1
2 changed files with 130 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/core/dcb.c
View File

@ -632,9 +632,15 @@ return_n:
int
dcb_write(DCB *dcb, GWBUF *queue)
{
int w, saved_errno = 0;
int w;
int saved_errno = 0;
ss_dassert(queue != NULL);
if (queue == NULL) {
return 0;
}
spinlock_acquire(&dcb->writeqlock);
if (dcb->writeq != NULL)
@ -694,11 +700,12 @@ int w, saved_errno = 0;
w = gw_write(dcb->fd, GWBUF_DATA(queue), len);
dcb->stats.n_writes++;
);
saved_errno = errno;
errno = 0;
if (w < 0)
{
saved_errno = errno;
errno = 0;
if (saved_errno == EPIPE) {
skygw_log_write(
LOGFILE_TRACE,
@ -740,16 +747,23 @@ int w, saved_errno = 0;
STRDCBSTATE(dcb->state),
dcb->fd);
}
/* Buffer the balance of any data */
dcb->writeq = queue;
if (queue)
/**
* What wasn't successfully written is stored to write queue
* for suspended write.
*/
dcb->writeq = queue;
if (queue != NULL)
{
dcb->stats.n_buffered++;
}
} /* if (dcb->writeq) */
spinlock_release(&dcb->writeqlock);
if (queue && (saved_errno != EAGAIN || saved_errno != EWOULDBLOCK))
if (saved_errno != 0 &&
queue != NULL &&
saved_errno != EAGAIN &&
saved_errno != EWOULDBLOCK)
{
queue = gwbuf_consume(queue, gwbuf_length(queue));
skygw_log_write_flush(