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

Make state-change logging conditional.

Browse Source
This commit is contained in:
Johan Wikman
2015-12-03 09:54:31 +02:00
parent af7a19b7b3
commit 2f54f33cfb
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1723,12 +1723,14 @@ 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)
{ {
#ifdef STATE_CHANGE_LOGGING_ENABLED
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),
slave->serverid, slave->serverid,
slave->binlogfile, (unsigned long)slave->binlog_pos); slave->binlogfile, (unsigned long)slave->binlog_pos);
#endif
} }
poll_fake_write_event(slave->dcb); poll_fake_write_event(slave->dcb);
break; break;

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

@ -2122,12 +2122,14 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1];
if ((cstate & CS_UPTODATE) == CS_UPTODATE) if ((cstate & CS_UPTODATE) == CS_UPTODATE)
{ {
#ifdef STATE_CHANGE_LOGGING_ENABLED
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),
slave->serverid, slave->serverid,
slave->binlogfile, (unsigned long)slave->binlog_pos); slave->binlogfile, (unsigned long)slave->binlog_pos);
#endif
} }
poll_fake_write_event(slave->dcb); poll_fake_write_event(slave->dcb);
@ -2154,6 +2156,8 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1];
if (state_change) if (state_change)
{ {
slave->stats.n_caughtup++; slave->stats.n_caughtup++;
#ifdef STATE_CHANGE_LOGGING_ENABLED
// TODO: The % 50 should be removed. Now only every 50th state change is logged.
if (slave->stats.n_caughtup == 1) if (slave->stats.n_caughtup == 1)
{ {
MXS_NOTICE("%s: Slave %s:%d, server-id %d is now up to date '%s', position %lu.", MXS_NOTICE("%s: Slave %s:%d, server-id %d is now up to date '%s', position %lu.",
@ -2172,6 +2176,7 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1];
slave->serverid, slave->serverid,
slave->binlogfile, (unsigned long)slave->binlog_pos); slave->binlogfile, (unsigned long)slave->binlog_pos);
} }
#endif
} }
} }
else else
@ -2286,12 +2291,14 @@ unsigned int cstate;
if ((cstate & CS_UPTODATE) == CS_UPTODATE) if ((cstate & CS_UPTODATE) == CS_UPTODATE)
{ {
#ifdef STATE_CHANGE_LOGGING_ENABLED
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),
slave->serverid, slave->serverid,
slave->binlogfile, (unsigned long)slave->binlog_pos); slave->binlogfile, (unsigned long)slave->binlog_pos);
#endif
} }
slave->stats.n_dcb++; slave->stats.n_dcb++;