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

MXS-1546: Don't check binlog read position when last event is HEARTBEAT_EVENT

Browse Source 
Don't check binlog read position when last event is HEARTBEAT_EVENT
This commit is contained in:
MassimilianoPinto
2017-11-28 13:24:35 +01:00
parent c44dd4a26c
commit e16eee0cc3
1 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/modules/routing/binlogrouter/blr_slave.c
View File

@ -2658,6 +2658,30 @@ blr_slave_catchup(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, bool large)
/* force slave to read events via catchup routine */ /* force slave to read events via catchup routine */
poll_fake_write_event(slave->dcb); poll_fake_write_event(slave->dcb);
} }
/**
* Handle Heartbeat: don't check anything else
* set CS_WAIT_DATA and return
*/
else if (hdr.ok == SLAVE_POS_READ_OK &&
slave->lastEventReceived == HEARTBEAT_EVENT)
{
#ifndef BLFILE_IN_SLAVE
blr_close_binlog(router, file);
#endif
spinlock_acquire(&router->binlog_lock);
spinlock_acquire(&slave->catch_lock);
/**
* Set the CS_WAIT_DATA that allows notification
* of new events after HEARTBEAT_EVENT
*/
slave->cstate |= CS_WAIT_DATA;
spinlock_release(&slave->catch_lock);
spinlock_release(&router->binlog_lock);
return 1;
}
else if (slave->binlog_pos == router->binlog_position && else if (slave->binlog_pos == router->binlog_position &&
strcmp(slave->binlogfile, router->binlog_name) == 0) strcmp(slave->binlogfile, router->binlog_name) == 0)
{ {
@ -5607,10 +5631,13 @@ blr_send_slave_heartbeat(void *inst)
sptr->serverid, sptr->heartbeat, sptr->serverid, sptr->heartbeat,
(unsigned long)sptr->lastReply); (unsigned long)sptr->lastReply);
blr_slave_send_heartbeat(router, sptr); if (blr_slave_send_heartbeat(router, sptr))
{
/* Set last event */
sptr->lastEventReceived = HEARTBEAT_EVENT;
/* Set last time */
sptr->lastReply = t_now; sptr->lastReply = t_now;
}
} }
sptr = sptr->next; sptr = sptr->next;