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

Missing lock release added

Browse Source 
Missing lock release added and log message update
This commit is contained in:
MassimilianoPinto
2015-11-19 08:58:49 +01:00
parent 6613723a1f
commit 90d2dc336c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/routing/binlog/blr_slave.c
View File

@ -2099,6 +2099,9 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1];
spinlock_release(&slave->catch_lock); spinlock_release(&slave->catch_lock);
spinlock_release(&router->binlog_lock); spinlock_release(&router->binlog_lock);
state_change = 1; state_change = 1;
} else {
spinlock_release(&slave->catch_lock);
spinlock_release(&router->binlog_lock);
} }
} }
@ -4400,9 +4403,9 @@ time_t t_now = time(0);
/* skip servers with state = 0 */ /* skip servers with state = 0 */
if ( (sptr->state == BLRS_DUMPING) && (sptr->heartbeat > 0) && ((t_now + 1 - sptr->lastReply) >= sptr->heartbeat) ) if ( (sptr->state == BLRS_DUMPING) && (sptr->heartbeat > 0) && ((t_now + 1 - sptr->lastReply) >= sptr->heartbeat) )
{ {
MXS_NOTICE("Sending Heartbeat to slave server-id %d in State %d, cstate %d. " MXS_NOTICE("Sending Heartbeat to slave server-id %d. "
"Heartbeat interval is %d, last event time is %lu", "Heartbeat interval is %d, last event time is %lu",
sptr->serverid, sptr->state, sptr->cstate, sptr->heartbeat, sptr->serverid, sptr->heartbeat,
(unsigned long)sptr->lastReply); (unsigned long)sptr->lastReply);
blr_slave_send_heartbeat(router, sptr); blr_slave_send_heartbeat(router, sptr);