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

master_id set by monitor

Browse Source 
master_id set by monitor and printed via dprint* routines
This commit is contained in:
MassimilianoPinto
2014-06-17 16:10:11 +02:00
parent e0c3ef24d7
commit 38fd7b0844
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/server.c
View File

@ -250,6 +250,7 @@ char *stat;
if (ptr->server_string) if (ptr->server_string)
dcb_printf(dcb, "\tServer Version:\t\t%s\n", ptr->server_string); dcb_printf(dcb, "\tServer Version:\t\t%s\n", ptr->server_string);
dcb_printf(dcb, "\tNode Id: %d\n", ptr->node_id); dcb_printf(dcb, "\tNode Id: %d\n", ptr->node_id);
dcb_printf(dcb, "\tMaster Id: %d\n", ptr->master_id);
if (SERVER_IS_SLAVE(ptr)) { if (SERVER_IS_SLAVE(ptr)) {
if (ptr->rlag >= 0) { if (ptr->rlag >= 0) {
dcb_printf(dcb, "\tSlave delay:\t\t%d\n", ptr->rlag); dcb_printf(dcb, "\tSlave delay:\t\t%d\n", ptr->rlag);
@ -286,6 +287,7 @@ char *stat;
if (server->server_string) if (server->server_string)
dcb_printf(dcb, "\tServer Version:\t\t%s\n", server->server_string); dcb_printf(dcb, "\tServer Version:\t\t%s\n", server->server_string);
dcb_printf(dcb, "\tNode Id: %d\n", server->node_id); dcb_printf(dcb, "\tNode Id: %d\n", server->node_id);
dcb_printf(dcb, "\tMaster Id: %d\n", server->master_id);
if (SERVER_IS_SLAVE(server)) { if (SERVER_IS_SLAVE(server)) {
if (server->rlag >= 0) { if (server->rlag >= 0) {
dcb_printf(dcb, "\tSlave delay:\t\t%d\n", server->rlag); dcb_printf(dcb, "\tSlave delay:\t\t%d\n", server->rlag);

3
server/modules/monitor/mysql_mon.c
View File

@ -538,12 +538,15 @@ int replication_heartbeat = handle->replicationHeartbeat;
if (mysql_query(database->con, "SHOW SLAVE STATUS") == 0 if (mysql_query(database->con, "SHOW SLAVE STATUS") == 0
&& (result = mysql_store_result(database->con)) != NULL) && (result = mysql_store_result(database->con)) != NULL)
{ {
int master_server_id;
num_fields = mysql_num_fields(result); num_fields = mysql_num_fields(result);
while ((row = mysql_fetch_row(result))) while ((row = mysql_fetch_row(result)))
{ {
if (strncmp(row[10], "Yes", 3) == 0 if (strncmp(row[10], "Yes", 3) == 0
&& strncmp(row[11], "Yes", 3) == 0) && strncmp(row[11], "Yes", 3) == 0)
isslave = 1; isslave = 1;
master_server_id = atoi(row[39]);
memcpy(&database->server->master_id, &master_server_id, sizeof(int));
} }
mysql_free_result(result); mysql_free_result(result);
} }