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

Improve logging support

Browse Source
This commit is contained in:
Mark Riddoch
2014-10-17 12:29:29 +01:00
parent e729a17fd4
commit 554a054e18
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,7 +166,6 @@ typedef struct router_slave {
*router; /*< Pointer to the owning router */ *router; /*< Pointer to the owning router */
struct router_slave *next; struct router_slave *next;
SLAVE_STATS stats; /*< Slave statistics */ SLAVE_STATS stats; /*< Slave statistics */
MEMLOG *clog;
#if defined(SS_DEBUG) #if defined(SS_DEBUG)
skygw_chk_t rses_chk_tail; skygw_chk_t rses_chk_tail;
#endif #endif

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

@ -570,6 +570,12 @@ uint32_t chksum;
dcb_add_callback(slave->dcb, DCB_REASON_DRAINED, blr_slave_callback, slave); dcb_add_callback(slave->dcb, DCB_REASON_DRAINED, blr_slave_callback, slave);
slave->state = BLRS_DUMPING; slave->state = BLRS_DUMPING;
LOGIF(LM, (skygw_log_write(
LOGFILE_MESSAGE,
"%s: New slave %s requested binlog file %s from position %lu",
router->service->name, slave->dcb->remote,
slave->binlogfile, slave->binlog_pos)));
if (slave->binlog_pos != router->binlog_position || if (slave->binlog_pos != router->binlog_position ||
strcmp(slave->binlogfile, router->binlog_name) != 0) strcmp(slave->binlogfile, router->binlog_name) != 0)
{ {
@ -689,11 +695,6 @@ GWBUF *head, *record;
REP_HEADER hdr; REP_HEADER hdr;
int written, rval = 1, burst; int written, rval = 1, burst;
uint8_t *ptr; uint8_t *ptr;
struct timespec req;
extern unsigned long hkheartbeat;
unsigned long beat;
beat = hkheartbeat;
if (large) if (large)
burst = router->long_burst; burst = router->long_burst;
@ -801,7 +802,9 @@ unsigned long beat;
if (state_change) if (state_change)
{ {
LOGIF(LM, (skygw_log_write(LOGFILE_MESSAGE, LOGIF(LM, (skygw_log_write(LOGFILE_MESSAGE,
"blr_slave_catchup slave is up to date %s, %u.", "%s: Slave %s is up to date %s, %u.",
router->service->name,
slave->dcb->remote,
slave->binlogfile, slave->binlog_pos))); slave->binlogfile, slave->binlog_pos)));
} }
} }
@ -862,8 +865,8 @@ ROUTER_INSTANCE *router = slave->router;
} }
else else
{ {
LOGIF(LM, (skygw_log_write( LOGIF(LD, (skygw_log_write(
LOGFILE_MESSAGE, "Ignored callback due to slave state %s", LOGFILE_DEBUG, "Ignored callback due to slave state %s",
blrs_states[slave->state]))); blrs_states[slave->state])));
} }
} }