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

Update current DCB for hangup events

Browse Source 
When fake hangup events are delivered via DCBs, the current DCB would not
be updated. This would cause error messages without a session ID which
makes failure analysis harder.
This commit is contained in:
Markus Mäkelä
2019-07-03 12:57:27 +03:00
parent 2d77a361f2
commit f36b6492ab
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/dcb.cc
View File

@ -2046,15 +2046,19 @@ static void dcb_hangup_foreach_worker(MXB_WORKER* worker, struct server* server)
{ {
RoutingWorker* rworker = static_cast<RoutingWorker*>(worker); RoutingWorker* rworker = static_cast<RoutingWorker*>(worker);
int id = rworker->id(); int id = rworker->id();
DCB* old_current = this_thread.current_dcb;
for (DCB* dcb = this_unit.all_dcbs[id]; dcb; dcb = dcb->thread.next) for (DCB* dcb = this_unit.all_dcbs[id]; dcb; dcb = dcb->thread.next)
{ {
if (dcb->state == DCB_STATE_POLLING && dcb->server && dcb->server == server && dcb->n_close == 0) if (dcb->state == DCB_STATE_POLLING && dcb->server && dcb->server == server && dcb->n_close == 0)
{ {
this_thread.current_dcb = dcb;
dcb->flags |= DCBF_HUNG; dcb->flags |= DCBF_HUNG;
dcb->func.hangup(dcb); dcb->func.hangup(dcb);
} }
} }
this_thread.current_dcb = old_current;
} }
/** /**