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

Fix problem with persistent DCB disposal

Browse Source
This commit is contained in:
counterpoint
2015-10-05 16:36:07 +01:00
parent e38ea9d07d
commit 5c985b42ba
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/dcb.c
View File

@ -560,7 +560,7 @@ dcb_process_victim_queue(DCB *listofdcb)
} }
else { else {
/* Must be DCB_STATE_POLLING */ /* Must be DCB_STATE_POLLING */
if (dcb_maybe_add_persistent(dcb)) if (0 == dcb->persistentstart && dcb_maybe_add_persistent(dcb))
{ {
/* Have taken DCB into persistent pool, no further killing */ /* Have taken DCB into persistent pool, no further killing */
dcb = dcb->memdata.next; dcb = dcb->memdata.next;
@ -1787,7 +1787,7 @@ dcb_close(DCB *dcb)
/* /*
* If DCB is in persistent pool, mark it as an error and exit * If DCB is in persistent pool, mark it as an error and exit
*/ */
if (dcb->persistentstart) if (dcb->persistentstart > 0)
{ {
dcb->dcb_errhandle_called = true; dcb->dcb_errhandle_called = true;
return; return;
@ -1796,7 +1796,7 @@ dcb_close(DCB *dcb)
spinlock_acquire(&zombiespin); spinlock_acquire(&zombiespin);
if (!dcb->dcb_is_zombie) if (!dcb->dcb_is_zombie)
{ {
if (dcb->server && DCB_STATE_POLLING == dcb->state) if (0 == dcb->persistentstart && dcb->server && DCB_STATE_POLLING == dcb->state)
{ {
/* May be a candidate for persistence, so save user name */ /* May be a candidate for persistence, so save user name */
char *user; char *user;
@ -2838,7 +2838,7 @@ dcb_persistent_clean_count(DCB *dcb, bool cleanall)
while (disposals) while (disposals)
{ {
nextdcb = disposals->nextpersistent; nextdcb = disposals->nextpersistent;
disposals->persistentstart = 0; disposals->persistentstart = -1;
if (DCB_STATE_POLLING == dcb->state) if (DCB_STATE_POLLING == dcb->state)
{ {
poll_remove_dcb(dcb); poll_remove_dcb(dcb);