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

Extract Gtid_Slave_Pos in mysqlmon

Browse Source 
The string form value of Gtid_Slave_Pos is extracted into different
integer components.
This commit is contained in:
Markus Mäkelä
2017-10-26 15:32:16 +03:00
parent 0be39b8545
commit 52473c379b
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/modules/monitor/mysqlmon/mysql_mon.cc
View File

@ -21,6 +21,7 @@
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include <inttypes.h>
#include <maxscale/alloc.h> #include <maxscale/alloc.h>
#include <maxscale/dcb.h> #include <maxscale/dcb.h>
#include <maxscale/debug.h> #include <maxscale/debug.h>
@ -48,6 +49,7 @@
#define MARIA10_STATUS_MASTER_ID 41 #define MARIA10_STATUS_MASTER_ID 41
#define MARIA10_STATUS_HEARTBEATS 55 #define MARIA10_STATUS_HEARTBEATS 55
#define MARIA10_STATUS_HEARTBEAT_PERIOD 56 #define MARIA10_STATUS_HEARTBEAT_PERIOD 56
#define MARIA10_STATUS_SLAVE_GTID 57
/** Column positions for SHOW SLAVE HOSTS */ /** Column positions for SHOW SLAVE HOSTS */
#define SLAVE_HOSTS_SERVER_ID 0 #define SLAVE_HOSTS_SERVER_ID 0
@ -592,6 +594,14 @@ typedef struct mysql_server_info
int slave_heartbeats; /**< Number of received heartbeats*/ int slave_heartbeats; /**< Number of received heartbeats*/
double heartbeat_period; /**< The time interval between heartbeats */ double heartbeat_period; /**< The time interval between heartbeats */
time_t latest_event; /**< Time when latest event was received from the master */ time_t latest_event; /**< Time when latest event was received from the master */
struct
{
uint32_t domain;
uint32_t server_id;
uint64_t sequence;
} slave_gtid;
} MYSQL_SERVER_INFO; } MYSQL_SERVER_INFO;
void* info_copy_func(const void *val) void* info_copy_func(const void *val)
@ -973,6 +983,12 @@ static enum mysql_server_version get_server_version(MXS_MONITORED_SERVER* db)
return MYSQL_SERVER_VERSION_51; return MYSQL_SERVER_VERSION_51;
} }
static void extract_slave_gtid(MYSQL_SERVER_INFO* info, const char* str)
{
sscanf(str, "%" PRIu32 "-%" PRIu32 "-%" PRIu64, &info->slave_gtid.domain,
&info->slave_gtid.server_id, &info->slave_gtid.sequence);
}
static bool do_show_slave_status(MYSQL_SERVER_INFO* serv_info, MXS_MONITORED_SERVER* database, static bool do_show_slave_status(MYSQL_SERVER_INFO* serv_info, MXS_MONITORED_SERVER* database,
enum mysql_server_version server_version) enum mysql_server_version server_version)
{ {
@ -1076,6 +1092,7 @@ static bool do_show_slave_status(MYSQL_SERVER_INFO* serv_info, MXS_MONITORED_SER
ss_debug(MYSQL_FIELD* f = mysql_fetch_fields(result)); ss_debug(MYSQL_FIELD* f = mysql_fetch_fields(result));
ss_dassert(strcmp(f[MARIA10_STATUS_HEARTBEATS].name, "Slave_received_heartbeats") == 0); ss_dassert(strcmp(f[MARIA10_STATUS_HEARTBEATS].name, "Slave_received_heartbeats") == 0);
ss_dassert(strcmp(f[MARIA10_STATUS_HEARTBEAT_PERIOD].name, "Slave_heartbeat_period") == 0); ss_dassert(strcmp(f[MARIA10_STATUS_HEARTBEAT_PERIOD].name, "Slave_heartbeat_period") == 0);
ss_dassert(strcmp(f[MARIA10_STATUS_SLAVE_GTID].name, "Gtid_Slave_Pos") == 0);
int heartbeats = atoi(row[MARIA10_STATUS_HEARTBEATS]); int heartbeats = atoi(row[MARIA10_STATUS_HEARTBEATS]);
if (serv_info->slave_heartbeats < heartbeats) if (serv_info->slave_heartbeats < heartbeats)
@ -1084,6 +1101,11 @@ static bool do_show_slave_status(MYSQL_SERVER_INFO* serv_info, MXS_MONITORED_SER
serv_info->slave_heartbeats = heartbeats; serv_info->slave_heartbeats = heartbeats;
serv_info->heartbeat_period = atof(row[MARIA10_STATUS_HEARTBEAT_PERIOD]); serv_info->heartbeat_period = atof(row[MARIA10_STATUS_HEARTBEAT_PERIOD]);
} }
if (row[MARIA10_STATUS_SLAVE_GTID])
{
extract_slave_gtid(serv_info, row[MARIA10_STATUS_SLAVE_GTID]);
}
} }
nconfigured++; nconfigured++;
@ -1100,6 +1122,7 @@ static bool do_show_slave_status(MYSQL_SERVER_INFO* serv_info, MXS_MONITORED_SER
serv_info->binlog_pos = 0; serv_info->binlog_pos = 0;
serv_info->binlog_name[0] = '\0'; serv_info->binlog_name[0] = '\0';
serv_info->slave_heartbeats = 0; serv_info->slave_heartbeats = 0;
serv_info->slave_gtid = {};
} }
serv_info->master_id = master_id; serv_info->master_id = master_id;