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

Fixed events which are exactly 0x00fffffe bytes long failing to replicate

Browse Source 
The empty packet sent after a large event which fits into exactly one packet
was written to disk and the writing of no bytes caused it to be treated as
an error.
This commit is contained in:
Markus Makela
2016-02-11 22:22:53 +02:00
parent 476691eda1
commit 3609f97ba0
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -922,7 +922,7 @@ uint32_t partialpos = 0;
* copy if the message straddles GWBUF's.
*/
if (len < BINLOG_EVENT_HDR_LEN)
if (len < BINLOG_EVENT_HDR_LEN && router->master_event_state != BLR_EVENT_ONGOING)
{
char *msg = "";
@ -1040,7 +1040,7 @@ uint32_t partialpos = 0;
/* pending large event */
if (router->master_event_state != BLR_EVENT_DONE)
{
if (len < MYSQL_PACKET_LENGTH_MAX)
if (len - MYSQL_HEADER_LEN < MYSQL_PACKET_LENGTH_MAX)
{
/** This is the last packet, we can now proceed to distribute
* the event */
@ -1277,8 +1277,13 @@ uint32_t partialpos = 0;
spinlock_release(&router->binlog_lock);
}
/* current event is being written to disk file */
if (blr_write_binlog_record(router, &hdr, len - offset, ptr) == 0)
/* Current event is being written to disk file.
* It is possible for an empty packet to be sent if an
* event is exactly 2^24 bytes long. In this case the
* empty packet should be discarded. */
if (len > MYSQL_HEADER_LEN + 1 &&
blr_write_binlog_record(router, &hdr, len - offset, ptr) == 0)
{
/*
* Failed to write to the