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

Reduce logging of binlog server

Browse Source 
Only the true state changes of a slave - up-to-date -> catch-up
or catch-up to up-to-date - are logged.
This commit is contained in:
Johan Wikman
2015-12-02 15:23:55 +02:00
parent 3d8adefa73
commit af7a19b7b3
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1723,7 +1723,7 @@ unsigned int cstate;
spinlock_release(&slave->catch_lock); spinlock_release(&slave->catch_lock);
if ((cstate & CS_UPTODATE) == CS_UPTODATE) if ((cstate & CS_UPTODATE) == CS_UPTODATE)
{ {
MXS_NOTICE("%s: Slave %s:%d, server-id %d transition from up to date to catch-up in blr_distribute_binlog_record, binlog file '%s', position %lu.", MXS_NOTICE("%s: Slave %s:%d, server-id %d transition from up-to-date to catch-up in blr_distribute_binlog_record, binlog file '%s', position %lu.",
router->service->name, router->service->name,
slave->dcb->remote, slave->dcb->remote,
ntohs((slave->dcb->ipv4).sin_port), ntohs((slave->dcb->ipv4).sin_port),

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

@ -2122,7 +2122,7 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1];
if ((cstate & CS_UPTODATE) == CS_UPTODATE) if ((cstate & CS_UPTODATE) == CS_UPTODATE)
{ {
MXS_NOTICE("%s: Slave %s:%d, server-id %d transition from up to date to catch-up in blr_slave_catchup, binlog file '%s', position %lu.", MXS_NOTICE("%s: Slave %s:%d, server-id %d transition from up-to-date to catch-up in blr_slave_catchup, binlog file '%s', position %lu.",
router->service->name, router->service->name,
slave->dcb->remote, slave->dcb->remote,
ntohs((slave->dcb->ipv4).sin_port), ntohs((slave->dcb->ipv4).sin_port),
@ -2271,15 +2271,6 @@ unsigned int cstate;
spinlock_release(&router->binlog_lock); spinlock_release(&router->binlog_lock);
if (do_return) { if (do_return) {
if ((slave->cstate & CS_EXPECTCB) == CS_EXPECTCB)
{
MXS_NOTICE("%s: Slave %s:%d, server-id %d transition to expect_call_back in blr_slave_callback, binlog file '%s', position %lu.",
router->service->name,
slave->dcb->remote,
ntohs((slave->dcb->ipv4).sin_port),
slave->serverid,
slave->binlogfile, (unsigned long)slave->binlog_pos);
}
spinlock_acquire(&slave->catch_lock); spinlock_acquire(&slave->catch_lock);
slave->cstate |= CS_EXPECTCB; slave->cstate |= CS_EXPECTCB;
spinlock_release(&slave->catch_lock); spinlock_release(&slave->catch_lock);
@ -2295,7 +2286,7 @@ unsigned int cstate;
if ((cstate & CS_UPTODATE) == CS_UPTODATE) if ((cstate & CS_UPTODATE) == CS_UPTODATE)
{ {
MXS_NOTICE("%s: Slave %s:%d, server-id %d transition from up to date to catch-up in blr_slave_callback, binlog file '%s', position %lu.", MXS_NOTICE("%s: Slave %s:%d, server-id %d transition from up-to-date to catch-up in blr_slave_callback, binlog file '%s', position %lu.",
router->service->name, router->service->name,
slave->dcb->remote, slave->dcb->remote,
ntohs((slave->dcb->ipv4).sin_port), ntohs((slave->dcb->ipv4).sin_port),