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

Fix more subtle bug and expand debug message for dcb_close entry.

Browse Source
This commit is contained in:
counterpoint
2015-07-07 09:12:38 +01:00
parent d4eff72d8a
commit 462c8e42ef
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/core/dcb.c
View File

@ -1885,24 +1885,18 @@ dcb_close(DCB *dcb)
CHK_DCB(dcb); CHK_DCB(dcb);
LOGIF(LD, (skygw_log_write(LOGFILE_DEBUG, LOGIF(LD, (skygw_log_write(LOGFILE_DEBUG,
"%lu [dcb_close]", "%lu [dcb_close] DCB %p in state %s",
pthread_self()))); pthread_self(),
dcb,
dcb ? STRDCBSTATE(dcb->state) : "Invalid DCB")));
if (DCB_STATE_ZOMBIE == dcb->state) if (DCB_STATE_ZOMBIE == dcb->state)
{ {
LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR,
"%lu [dcb_close] Error : Removing DCB %p but was in state %s "
"which is unexpected for a call to dcb_close, but not crashing. ",
pthread_self(),
dcb,
STRDCBSTATE(dcb->state))));
return; return;
} }
if (DCB_STATE_UNDEFINED == dcb->state if (DCB_STATE_UNDEFINED == dcb->state
|| DCB_STATE_DISCONNECTED == dcb->state || DCB_STATE_DISCONNECTED == dcb->state)
|| DCB_STATE_ZOMBIE == dcb->state)
{ {
LOGIF(LE, (skygw_log_write( LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR, LOGFILE_ERROR,