MXS-224: Added SQL commands to the log message at slave disconnect time

mariadb-corporation · Aug 19, 2015 · 8959894 · 8959894
1 parent 3f26c30
commit 8959894
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/server/modules/include/blr.h b/server/modules/include/blr.h
@@ -207,6 +207,7 @@ typedef struct {
 	int		n_bursts;	/*< Number of bursts sent */
 	int		n_requests;	/*< Number of requests received */
 	int		n_flows;	/*< Number of flow control restarts */
+	int		n_queries;	/*< Number of SQL queries */
 	int		n_upd;
 	int		n_cb;
 	int		n_cbna;

diff --git a/server/modules/routing/binlog/blr.c b/server/modules/routing/binlog/blr.c
@@ -640,10 +640,12 @@ ROUTER_SLAVE	 *slave = (ROUTER_SLAVE *)router_session;
 		LOGIF(LM, (skygw_log_write_flush(
 			LOGFILE_MESSAGE,
 			"%s: Slave %s, server id %d, disconnected after %ld seconds. "
-			"%d events sent, %lu bytes.",
+			"%d SQL commands, %d events sent (%lu bytes).",
 			router->service->name, slave->dcb->remote,
 			slave->serverid,
-			time(0) - slave->connect_time, slave->stats.n_events,
+			time(0) - slave->connect_time,
+			slave->stats.n_queries,
+			slave->stats.n_events,
 			slave->stats.n_bytes)));
 
 		/*

diff --git a/server/modules/routing/binlog/blr_slave.c b/server/modules/routing/binlog/blr_slave.c
@@ -122,6 +122,7 @@ blr_slave_request(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue)
 	switch (MYSQL_COMMAND(queue))
 	{
 	case COM_QUERY:
+		slave->stats.n_queries++;
 		return blr_slave_query(router, slave, queue);
 		break;
 	case COM_REGISTER_SLAVE: