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

Merge branch '2.4.11' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2020-07-13 15:20:33 +03:00
parent 38838e1f69 6abdb60b58
commit cb0217a776
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/core/routingworker.cc
View File

@ -559,8 +559,6 @@ void RoutingWorker::register_zombie(DCB* pDcb)
void RoutingWorker::delete_zombies() void RoutingWorker::delete_zombies()
{ {
Zombies not_ready;
// An algorithm cannot be used, as the final closing of a DCB may cause // An algorithm cannot be used, as the final closing of a DCB may cause
// other DCBs to be registered in the zombie queue. // other DCBs to be registered in the zombie queue.
@ -569,17 +567,8 @@ void RoutingWorker::delete_zombies()
DCB* pDcb = m_zombies.back(); DCB* pDcb = m_zombies.back();
m_zombies.pop_back(); m_zombies.pop_back();
if (can_close_dcb(pDcb)) dcb_final_close(pDcb);
{
dcb_final_close(pDcb);
}
else
{
not_ready.push_back(pDcb);
}
} }
m_zombies.insert(m_zombies.end(), not_ready.begin(), not_ready.end());
} }
bool RoutingWorker::pre_run() bool RoutingWorker::pre_run()