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

MXS-1376 All zombie related code removed

Browse Source 
As dcbs are now closed when dcb_close() is called and there is
no zombie queue, the zombie state can also be removed.
This commit is contained in:
Johan Wikman
2017-08-25 11:28:58 +03:00
parent c11d8fa328
commit 9c25e6d995
9 changed files with 13 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
View File

@ -434,7 +434,7 @@ gw_read_backend_event(DCB *dcb)
return 0;
}
if (dcb->dcb_is_zombie || dcb->session == NULL ||
if (dcb->session == NULL ||
dcb->session->state == SESSION_STATE_DUMMY)
{
return 0;

3
server/modules/protocol/MySQL/MySQLClient/mysql_client.cc
View File

@ -1211,8 +1211,7 @@ int gw_write_client_event(DCB *dcb)
return_1:
#if defined(SS_DEBUG)
if (dcb->state == DCB_STATE_POLLING ||
dcb->state == DCB_STATE_NOPOLLING ||
dcb->state == DCB_STATE_ZOMBIE)
dcb->state == DCB_STATE_NOPOLLING)
{
CHK_PROTOCOL(protocol);
}

2
server/modules/protocol/MySQL/mysql_common.c
View File

@ -196,7 +196,7 @@ int mysql_send_com_quit(DCB* dcb,
CHK_DCB(dcb);
ss_dassert(packet_number <= 255);
if (dcb == NULL || dcb->state == DCB_STATE_ZOMBIE)
if (dcb == NULL)
{
return 0;
}

10
server/modules/routing/maxinfo/maxinfo_exec.c
View File

@ -987,15 +987,6 @@ maxinfo_internal_dcbs()
return dcb_count_by_usage(DCB_USAGE_INTERNAL);
}
/**
* Interface to dcb_count_by_usage for zombie dcbs
*/
static int
maxinfo_zombie_dcbs()
{
return dcb_count_by_usage(DCB_USAGE_ZOMBIE);
}
/**
* Interface to poll stats for reads
*/
@ -1097,7 +1088,6 @@ static struct
{ "Client_connections", VT_INT, (STATSFUNC)maxinfo_client_dcbs },
{ "Backend_connections", VT_INT, (STATSFUNC)maxinfo_backend_dcbs },
{ "Listeners", VT_INT, (STATSFUNC)maxinfo_listener_dcbs },
{ "Zombie_connections", VT_INT, (STATSFUNC)maxinfo_zombie_dcbs },
{ "Internal_descriptors", VT_INT, (STATSFUNC)maxinfo_internal_dcbs },
{ "Read_events", VT_INT, (STATSFUNC)maxinfo_read_events },
{ "Write_events", VT_INT, (STATSFUNC)maxinfo_write_events },