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

Throw away poll events that occur for persistent pool DCBs with no related session; fix typos.

Browse Source
This commit is contained in:
Martin Brampton
2015-06-14 18:19:30 +01:00
parent dc21ef0165
commit 84d5af1e00
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/dcb.c
View File

@ -656,6 +656,7 @@ char *user;
LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG,
"%lu [dcb_connect] Reusing a persistent connection, dcb %p\n", pthread_self(), dcb)));
dcb->persistentstart = 0;
return dcb;
}
}
@ -1298,11 +1299,14 @@ dcb_close(DCB *dcb)
STRDCBSTATE(dcb->state))));
dcb_close_finish(dcb);
atomic_add(&dcb->server->stats.n_current, -1);
}
}
if (dcb->server) atomic_add(&dcb->server->stats.n_current, -1);
ss_dassert(dcb->state == DCB_STATE_NOPOLLING ||
dcb->state == DCB_STATE_ZOMBIE);
}
ss_dassert(dcb->state == DCB_STATE_NOPOLLING ||
dcb->state == DCB_STATE_ZOMBIE ||
dcb->state == DCB_STATE_POLLING);
}
}
}