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

Merge branch 'develop' into MXS-212

Browse Source
This commit is contained in:
Markus Makela
2015-06-23 11:27:57 +03:00
parent dc43a7d9da 15e6d6f9fc
commit 2cfc93838e
4 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/modules/include/blr.h
View File

@ -34,6 +34,7 @@
#include <pthread.h> #include <pthread.h>
#include <memlog.h> #include <memlog.h>
#include <zlib.h>
#define BINLOG_FNAMELEN 16 #define BINLOG_FNAMELEN 16
#define BLR_PROTOCOL "MySQLBackend" #define BLR_PROTOCOL "MySQLBackend"

1
server/modules/monitor/mmmon.c
View File

@ -126,6 +126,7 @@ startMonitor(void *arg,void* opt)
handle->shutdown = 0; handle->shutdown = 0;
handle->id = MONITOR_DEFAULT_ID; handle->id = MONITOR_DEFAULT_ID;
handle->master = NULL; handle->master = NULL;
handle->script = NULL;
memset(handle->events,false,sizeof(handle->events)); memset(handle->events,false,sizeof(handle->events));
spinlock_init(&handle->lock); spinlock_init(&handle->lock);
} }

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

@ -210,9 +210,8 @@ int fd;
close(router->binlog_fd); close(router->binlog_fd);
spinlock_acquire(&router->binlog_lock); spinlock_acquire(&router->binlog_lock);
strncpy(router->binlog_name, file,BINLOG_FNAMELEN); strncpy(router->binlog_name, file,BINLOG_FNAMELEN);
blr_file_add_magic(router, fd);
spinlock_release(&router->binlog_lock);
router->binlog_fd = fd; router->binlog_fd = fd;
spinlock_release(&router->binlog_lock);
return 1; return 1;
} }
@ -254,12 +253,13 @@ int fd;
LOGIF(LE, (skygw_log_write(LOGFILE_ERROR, LOGIF(LE, (skygw_log_write(LOGFILE_ERROR,
"%s: binlog file %s has an invalid length %d.", "%s: binlog file %s has an invalid length %d.",
router->service->name, path, router->binlog_position))); router->service->name, path, router->binlog_position)));
close(fd); close(fd);
spinlock_release(&router->binlog_lock);
return; return;
} }
} }
spinlock_release(&router->binlog_lock);
router->binlog_fd = fd; router->binlog_fd = fd;
spinlock_release(&router->binlog_lock);
} }
/** /**

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

@ -1693,6 +1693,9 @@ uint32_t chksum;
binlognamelen = strlen(slave->binlogfile); binlognamelen = strlen(slave->binlogfile);
len = 19 + 8 + 4 + binlognamelen; len = 19 + 8 + 4 + binlognamelen;
/* no slave crc, remove 4 bytes */
if (slave->nocrc)
len -= 4;
// Build a fake rotate event // Build a fake rotate event
resp = gwbuf_alloc(len + 5); resp = gwbuf_alloc(len + 5);
@ -1711,17 +1714,19 @@ uint32_t chksum;
memcpy(ptr, slave->binlogfile, binlognamelen); memcpy(ptr, slave->binlogfile, binlognamelen);
ptr += binlognamelen; ptr += binlognamelen;
/* if (!slave->nocrc) {
* Now add the CRC to the fake binlog rotate event. /*
* * Now add the CRC to the fake binlog rotate event.
* The algorithm is first to compute the checksum of an empty buffer *
* and then the checksum of the event portion of the message, ie we do not * The algorithm is first to compute the checksum of an empty buffer
* include the length, sequence number and ok byte that makes up the first * and then the checksum of the event portion of the message, ie we do not
* 5 bytes of the message. We also do not include the 4 byte checksum itself. * include the length, sequence number and ok byte that makes up the first
*/ * 5 bytes of the message. We also do not include the 4 byte checksum itself.
chksum = crc32(0L, NULL, 0); */
chksum = crc32(chksum, GWBUF_DATA(resp) + 5, hdr.event_size - 4); chksum = crc32(0L, NULL, 0);
encode_value(ptr, chksum, 32); chksum = crc32(chksum, GWBUF_DATA(resp) + 5, hdr.event_size - 4);
encode_value(ptr, chksum, 32);
}
slave->dcb->func.write(slave->dcb, resp); slave->dcb->func.write(slave->dcb, resp);
return 1; return 1;