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

Zombie processing had an risk of getting into an infinite loop.

Browse Source
This commit is contained in:
vraatikka
2013-09-27 11:20:28 +03:00
parent 46c5564313
commit 1120ae9b2c
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/dcb.c
View File

@ -160,6 +160,7 @@ dcb_add_to_zombieslist(DCB *dcb)
if (dcb->state != DCB_STATE_NOPOLLING) { if (dcb->state != DCB_STATE_NOPOLLING) {
ss_dassert(dcb->state != DCB_STATE_POLLING && ss_dassert(dcb->state != DCB_STATE_POLLING &&
dcb->state != DCB_STATE_LISTENING); dcb->state != DCB_STATE_LISTENING);
spinlock_release(&zombiespin);
return; return;
} }
@ -251,14 +252,12 @@ void* rsession = NULL;
*/ */
{ {
SESSION *local_session = dcb->session; SESSION *local_session = dcb->session;
#if 1
/** /**
* Remove reference from session if dcb is client. * Remove reference from session if dcb is client.
*/ */
if (local_session->client == dcb) { if (local_session->client == dcb) {
local_session->client = NULL; local_session->client = NULL;
} }
#endif
dcb->session = NULL; dcb->session = NULL;
session_free(local_session); session_free(local_session);
} }
@ -621,6 +620,7 @@ dcb_write(DCB *dcb, GWBUF *queue)
{ {
int w, saved_errno = 0; int w, saved_errno = 0;
ss_dassert(queue != NULL);
spinlock_acquire(&dcb->writeqlock); spinlock_acquire(&dcb->writeqlock);
if (dcb->writeq) if (dcb->writeq)
@ -700,10 +700,6 @@ int w, saved_errno = 0;
* queue with have. * queue with have.
*/ */
queue = gwbuf_consume(queue, w); queue = gwbuf_consume(queue, w);
if (w < len)
{
/* We didn't write all the data */
}
skygw_log_write( skygw_log_write(
LOGFILE_TRACE, LOGFILE_TRACE,
"%lu [dcb_write] Wrote %d Bytes to dcb %p fd %d", "%lu [dcb_write] Wrote %d Bytes to dcb %p fd %d",
@ -718,7 +714,7 @@ int w, saved_errno = 0;
{ {
dcb->stats.n_buffered++; dcb->stats.n_buffered++;
} }
} } /* if (dcb->writeq) */
spinlock_release(&dcb->writeqlock); spinlock_release(&dcb->writeqlock);
if (queue && (saved_errno != EAGAIN || saved_errno != EWOULDBLOCK)) if (queue && (saved_errno != EAGAIN || saved_errno != EWOULDBLOCK))