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

Check return value of ioctl in dcb_read and act accordingly.

Browse Source
This commit is contained in:
vraatikka
2013-08-19 19:40:51 +03:00
parent ea79b38e4f
commit c5ed473ab7
1 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
server/core/dcb.c
View File

@ -145,7 +145,9 @@ dcb_free(DCB *dcb)
{ {
if (ptr == dcb) if (ptr == dcb)
{ {
skygw_log_write( LOGFILE_ERROR, "Attempt to add DCB to zombie queue " skygw_log_write(
LOGFILE_ERROR,
"Attempt to add DCB to zombie queue "
"when it is already in the queue"); "when it is already in the queue");
break; break;
} }
@ -352,20 +354,22 @@ int eno = 0;
errno = 0; errno = 0;
skygw_log_write( skygw_log_write(
LOGFILE_ERROR, LOGFILE_ERROR,
"%lu [dcb_read] Setting FIONREAD for %d failed. " "%lu [dcb_read] Setting FIONREAD for fd %d failed. "
"errno %d, %s", "errno %d, %s. dcb->state = %d",
pthread_self(), pthread_self(),
dcb->fd, dcb->fd,
eno , eno ,
strerror(eno)); strerror(eno),
dcb->state);
skygw_log_write( skygw_log_write(
LOGFILE_TRACE, LOGFILE_TRACE,
"%lu [dcb_read] Setting FIONREAD for %d failed. " "%lu [dcb_read] Setting FIONREAD for fd %d failed. "
"errno %d, %s", "errno %d, %s. dcb->state = %d",
pthread_self(), pthread_self(),
dcb->fd, dcb->fd,
eno , eno ,
strerror(eno)); strerror(eno),
dcb->state);
return -1; return -1;
} }
@ -405,8 +409,32 @@ int eno = 0;
*head = gwbuf_append(*head, buffer); *head = gwbuf_append(*head, buffer);
/* Re issue the ioctl as the amount of data buffered may have changed */ /* Re issue the ioctl as the amount of data buffered may have changed */
ioctl(dcb->fd, FIONREAD, &b); rc = ioctl(dcb->fd, FIONREAD, &b);
if (rc == -1) {
eno = errno;
errno = 0;
skygw_log_write(
LOGFILE_ERROR,
"%lu [dcb_read] Setting FIONREAD for fd %d failed. "
"errno %d, %s. dcb->state = %d",
pthread_self(),
dcb->fd,
eno ,
strerror(eno),
dcb->state);
skygw_log_write(
LOGFILE_TRACE,
"%lu [dcb_read] Setting FIONREAD for fd %d failed. "
"errno %d, %s. dcb->state = %d",
pthread_self(),
dcb->fd,
eno ,
strerror(eno),
dcb->state);
return -1;
} }
} /**< while (b>0) */
return n; return n;
} }
@ -594,7 +622,10 @@ dcb_close(DCB *dcb)
/** protect state check and set */ /** protect state check and set */
spinlock_acquire(&dcb->writeqlock); spinlock_acquire(&dcb->writeqlock);
if (dcb->state == DCB_STATE_DISCONNECTED || dcb->state == DCB_STATE_FREED) { if (dcb->state == DCB_STATE_DISCONNECTED ||
dcb->state == DCB_STATE_FREED ||
dcb->state == DCB_STATE_ZOMBIE)
{
spinlock_release(&dcb->writeqlock); spinlock_release(&dcb->writeqlock);
return; return;
} }
@ -606,17 +637,17 @@ dcb_close(DCB *dcb)
if (dcb_isclient(dcb)) if (dcb_isclient(dcb))
{ {
/* /*
* If the DCB we are closing is a client side DCB then shutdown the * If the DCB we are closing is a client side DCB then shutdown
* router session. This will close any backend connections. * the router session. This will close any backend connections.
*/ */
SERVICE *service = dcb->session->service; SERVICE *service = dcb->session->service;
if (service && service->router && dcb->session->router_session) if (service && service->router && dcb->session->router_session)
{ {
service->router->closeSession(service->router_instance, service->router->closeSession(
service->router_instance,
dcb->session->router_session); dcb->session->router_session);
} }
session_free(dcb->session); session_free(dcb->session);
} }
dcb_free(dcb); dcb_free(dcb);