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

Relax dcb_close assert

Browse Source 
If the current worker id is -1, we do not insist that the dcb
is closed by the owning thread. That will happen only for dcbs
that are created before the workers have been started and hence
it is also ok to close them after the workers have exited.
This commit is contained in:
Johan Wikman
2017-09-04 15:44:44 +03:00
parent b43ab674e3
commit 2f0292fd68
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/dcb.cc
View File

@ -1048,10 +1048,11 @@ void dcb_close(DCB *dcb)
CHK_DCB(dcb); CHK_DCB(dcb);
#if defined(SS_DEBUG) #if defined(SS_DEBUG)
if (dcb->poll.thread.id != Worker::get_current_id()) int wid = Worker::get_current_id();
if ((wid != -1) && (dcb->poll.thread.id != wid))
{ {
MXS_ALERT("dcb_close(%p) called by %d, owned by %d.", MXS_ALERT("dcb_close(%p) called by %d, owned by %d.",
dcb, Worker::get_current_id(), dcb->poll.thread.id); dcb, wid, dcb->poll.thread.id);
ss_dassert(dcb->poll.thread.id == Worker::get_current_id()); ss_dassert(dcb->poll.thread.id == Worker::get_current_id());
} }
#endif #endif
@ -1137,10 +1138,11 @@ void dcb_close_in_owning_thread(DCB* dcb)
static void dcb_final_close(DCB* dcb) static void dcb_final_close(DCB* dcb)
{ {
#if defined(SS_DEBUG) #if defined(SS_DEBUG)
if (dcb->poll.thread.id != Worker::get_current_id()) int wid = Worker::get_current_id();
if ((wid != -1) && (dcb->poll.thread.id != wid))
{ {
MXS_ALERT("dcb_final_close(%p) called by %d, owned by %d.", MXS_ALERT("dcb_final_close(%p) called by %d, owned by %d.",
dcb, Worker::get_current_id(), dcb->poll.thread.id); dcb, wid, dcb->poll.thread.id);
ss_dassert(dcb->poll.thread.id == Worker::get_current_id()); ss_dassert(dcb->poll.thread.id == Worker::get_current_id());
} }
#endif #endif
@ -2784,8 +2786,6 @@ void dcb_add_to_list(DCB *dcb)
*/ */
static void dcb_remove_from_list(DCB *dcb) static void dcb_remove_from_list(DCB *dcb)
{ {
ss_dassert(Worker::get_current_id() == dcb->poll.thread.id);
if (dcb == this_unit.all_dcbs[dcb->poll.thread.id]) if (dcb == this_unit.all_dcbs[dcb->poll.thread.id])
{ {
DCB *tail = this_unit.all_dcbs[dcb->poll.thread.id]->thread.tail; DCB *tail = this_unit.all_dcbs[dcb->poll.thread.id]->thread.tail;