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

Merge branch '1.2.1-binlog_router_trx' into release-1.4.2

Browse Source
This commit is contained in:
Markus Makela
2016-04-15 11:15:01 +03:00
parent 312c825b4e 2855389fe2
commit affba3cd65
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/routing/binlog/blr_master.c
View File

@ -1927,11 +1927,15 @@ blr_distribute_binlog_record(ROUTER_INSTANCE *router, REP_HEADER *hdr, uint8_t *
slave->binlogfile, slave->binlog_pos, slave->binlogfile, slave->binlog_pos,
hdr->next_pos - hdr->event_size); hdr->next_pos - hdr->event_size);
} }
/* If none of the above conditions were met, a slave in catchup
* mode transitioned into up-to-date mode while we were
* distributing events. The slave needs to be forced into
* catchup mode since it isn't up to date anymore. */
} }
else if (rotate) else if (rotate)
{ {
/** Slave is more than one binlog file behind */ /** Slave is more than one binlog file behind */
MXS_ERROR("Slave %s:%d server ID %d is behind more than one binlog file " MXS_WARNING("Slave %s:%d server ID %d is behind more than one binlog file "
"from the master. Slave is using '%s' with position %d " "from the master. Slave is using '%s' with position %d "
"when master binlog file is '%s'.", slave->dcb->remote, "when master binlog file is '%s'.", slave->dcb->remote,
ntohs((slave->dcb->ipv4).sin_port), slave->serverid, ntohs((slave->dcb->ipv4).sin_port), slave->serverid,
@ -1940,7 +1944,7 @@ blr_distribute_binlog_record(ROUTER_INSTANCE *router, REP_HEADER *hdr, uint8_t *
else else
{ {
/** Slave is lagging behind */ /** Slave is lagging behind */
MXS_ERROR("Slave %s:%d server ID %d is using binlog file '%s' with " MXS_WARNING("Slave %s:%d server ID %d is using binlog file '%s' with "
"position %d. Master binlog file is '%s' at position %lu " "position %d. Master binlog file is '%s' at position %lu "
"with last safe event at %lu.", slave->dcb->remote, "with last safe event at %lu.", slave->dcb->remote,
ntohs((slave->dcb->ipv4).sin_port), slave->serverid, ntohs((slave->dcb->ipv4).sin_port), slave->serverid,