From 38fd7b084418b26e1b152d12d6b2fd7faca73ed7 Mon Sep 17 00:00:00 2001 From: MassimilianoPinto Date: Tue, 17 Jun 2014 16:10:11 +0200 Subject: [PATCH] master_id set by monitor master_id set by monitor and printed via dprint* routines --- server/core/server.c | 2 ++ server/modules/monitor/mysql_mon.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/server/core/server.c b/server/core/server.c index c1bec6189..0ace1cc64 100644 --- a/server/core/server.c +++ b/server/core/server.c @@ -250,6 +250,7 @@ char *stat; if (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, "\tMaster Id: %d\n", ptr->master_id); if (SERVER_IS_SLAVE(ptr)) { if (ptr->rlag >= 0) { dcb_printf(dcb, "\tSlave delay:\t\t%d\n", ptr->rlag); @@ -286,6 +287,7 @@ char *stat; if (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, "\tMaster Id: %d\n", server->master_id); if (SERVER_IS_SLAVE(server)) { if (server->rlag >= 0) { dcb_printf(dcb, "\tSlave delay:\t\t%d\n", server->rlag); diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c index d643a00b9..c44c154bb 100644 --- a/server/modules/monitor/mysql_mon.c +++ b/server/modules/monitor/mysql_mon.c @@ -538,12 +538,15 @@ int replication_heartbeat = handle->replicationHeartbeat; if (mysql_query(database->con, "SHOW SLAVE STATUS") == 0 && (result = mysql_store_result(database->con)) != NULL) { + int master_server_id; num_fields = mysql_num_fields(result); while ((row = mysql_fetch_row(result))) { if (strncmp(row[10], "Yes", 3) == 0 && strncmp(row[11], "Yes", 3) == 0) isslave = 1; + master_server_id = atoi(row[39]); + memcpy(&database->server->master_id, &master_server_id, sizeof(int)); } mysql_free_result(result); }