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

Remove memlog diagnostics used to find issues with transistion between

Browse Source 
catchup and follow mode.
This commit is contained in:
Mark Riddoch
2014-10-17 11:14:10 +01:00
parent 81b5ad76a2
commit 2edab598b2
3 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,13 +385,6 @@ ROUTER_SLAVE *slave;
slave->router = inst; slave->router = inst;
slave->file = NULL; slave->file = NULL;
strcpy(slave->binlogfile, "unassigned"); strcpy(slave->binlogfile, "unassigned");
{
char buf[1000];
sprintf(buf, "Slave History %x", slave);
slave->clog = memlog_create(buf, ML_INT, 2000);
if (slave->clog)
memlog_set(slave->clog, MLNOAUTOFLUSH);
}
/** /**
* Add this session to the list of active sessions. * Add this session to the list of active sessions.

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

@ -1008,8 +1008,6 @@ int action;
slave->cstate &= ~(CS_UPTODATE|CS_BUSY); slave->cstate &= ~(CS_UPTODATE|CS_BUSY);
slave->cstate |= CS_EXPECTCB; slave->cstate |= CS_EXPECTCB;
spinlock_release(&slave->catch_lock); spinlock_release(&slave->catch_lock);
memlog_log(slave->clog, 22);
memlog_flush(slave->clog);
poll_fake_write_event(slave->dcb); poll_fake_write_event(slave->dcb);
} }
else else
@ -1022,8 +1020,6 @@ int action;
slave->cstate &= ~(CS_UPTODATE|CS_BUSY); slave->cstate &= ~(CS_UPTODATE|CS_BUSY);
slave->cstate |= CS_EXPECTCB; slave->cstate |= CS_EXPECTCB;
spinlock_release(&slave->catch_lock); spinlock_release(&slave->catch_lock);
memlog_log(slave->clog, 21);
memlog_flush(slave->clog);
poll_fake_write_event(slave->dcb); poll_fake_write_event(slave->dcb);
} }
} }
@ -1038,7 +1034,6 @@ int action;
{ {
slave->cstate |= CS_EXPECTCB; slave->cstate |= CS_EXPECTCB;
spinlock_release(&slave->catch_lock); spinlock_release(&slave->catch_lock);
memlog_log(slave->clog, 20);
poll_fake_write_event(slave->dcb); poll_fake_write_event(slave->dcb);
} }
else else

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

@ -703,7 +703,6 @@ unsigned long beat;
if (slave->cstate & CS_BUSY) if (slave->cstate & CS_BUSY)
{ {
spinlock_release(&slave->catch_lock); spinlock_release(&slave->catch_lock);
memlog_log(slave->clog, 1);
return 0; return 0;
} }
slave->cstate |= CS_BUSY; slave->cstate |= CS_BUSY;
@ -719,7 +718,6 @@ unsigned long beat;
slave->binlogfile))); slave->binlogfile)));
slave->cstate &= ~CS_BUSY; slave->cstate &= ~CS_BUSY;
slave->state = BLRS_ERRORED; slave->state = BLRS_ERRORED;
memlog_log(slave->clog, 2);
return 0; return 0;
} }
} }
@ -768,7 +766,6 @@ unsigned long beat;
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);
memlog_log(slave->clog, 3);
poll_fake_write_event(slave->dcb); poll_fake_write_event(slave->dcb);
} }
else if (slave->binlog_pos == router->binlog_position && else if (slave->binlog_pos == router->binlog_position &&
@ -787,7 +784,6 @@ unsigned long beat;
{ {
slave->cstate &= ~CS_UPTODATE; slave->cstate &= ~CS_UPTODATE;
slave->cstate |= CS_EXPECTCB; slave->cstate |= CS_EXPECTCB;
memlog_log(slave->clog, 30);
poll_fake_write_event(slave->dcb); poll_fake_write_event(slave->dcb);
} }
else else
@ -797,10 +793,7 @@ unsigned long beat;
slave->stats.n_upd++; slave->stats.n_upd++;
slave->cstate |= CS_UPTODATE; slave->cstate |= CS_UPTODATE;
state_change = 1; state_change = 1;
memlog_log(slave->clog, 4);
} }
else
memlog_log(slave->clog, 5);
} }
spinlock_release(&slave->catch_lock); spinlock_release(&slave->catch_lock);
spinlock_release(&router->binlog_lock); spinlock_release(&router->binlog_lock);
@ -829,14 +822,12 @@ unsigned long beat;
"which is not the file currently being downloaded.", "which is not the file currently being downloaded.",
slave->binlogfile))); slave->binlogfile)));
slave->state = BLRS_ERRORED; slave->state = BLRS_ERRORED;
memlog_log(slave->clog, 6);
} }
else else
{ {
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);
memlog_log(slave->clog, 7);
poll_fake_write_event(slave->dcb); poll_fake_write_event(slave->dcb);
} }
} }
@ -874,7 +865,6 @@ ROUTER_INSTANCE *router = slave->router;
LOGIF(LM, (skygw_log_write( LOGIF(LM, (skygw_log_write(
LOGFILE_MESSAGE, "Ignored callback due to slave state %s", LOGFILE_MESSAGE, "Ignored callback due to slave state %s",
blrs_states[slave->state]))); blrs_states[slave->state])));
memlog_log(slave->clog, 8);
} }
} }