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

MXS-1266: add MariaDB GTID fields in SHOW SLAVE STATUS

Browse Source 
MXS-1266: add MariaDB GTID fields in SHOW SLAVE STATUS
This commit is contained in:
MassimilianoPinto
2017-06-08 17:35:01 +02:00
parent 887e511fc5
commit c00d829d56
2 changed files with 105 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/modules/routing/binlogrouter/blr.h
View File

@ -105,11 +105,12 @@ MXS_BEGIN_DECLS
*/ */
#define BINLOG_FILE_EXTRA_INFO GTID_MAX_LEN #define BINLOG_FILE_EXTRA_INFO GTID_MAX_LEN
enum blr_binlog_storage_type enum binlog_storage_type
{ {
BLR_BINLOG_STORAGE_FLAT, BLR_BINLOG_STORAGE_FLAT,
BLR_BINLOG_STORAGE_TREEE BLR_BINLOG_STORAGE_TREE
}; };
/** /**
* Supported Encryption algorithms * Supported Encryption algorithms
* *
@ -650,8 +651,10 @@ typedef struct router_instance
DCB *client; /*< DCB for dummy client */ DCB *client; /*< DCB for dummy client */
MXS_SESSION *session; /*< Fake session for master connection */ MXS_SESSION *session; /*< Fake session for master connection */
unsigned int master_state; /*< State of the master FSM */ unsigned int master_state; /*< State of the master FSM */
uint8_t lastEventReceived; /*< Last even received */ uint8_t lastEventReceived;
uint32_t lastEventTimestamp; /*< Timestamp from last event */ /*< Last event received */
uint32_t lastEventTimestamp;
/*< Timestamp from last event */
MASTER_RESPONSES saved_master; /*< Saved master responses */ MASTER_RESPONSES saved_master; /*< Saved master responses */
char *binlogdir; /*< The directory with the binlog files */ char *binlogdir; /*< The directory with the binlog files */
SPINLOCK binlog_lock; /*< Lock to control update of the binlog position */ SPINLOCK binlog_lock; /*< Lock to control update of the binlog position */
@ -661,7 +664,7 @@ typedef struct router_instance
enum blr_event_state master_event_state; enum blr_event_state master_event_state;
/*< Packet read state */ /*< Packet read state */
REP_HEADER stored_header; REP_HEADER stored_header;
/*< Relication header of the event the master is sending */ /*< Replication header of the event the master is sending */
GWBUF *stored_event; /*< Buffer where partial events are stored */ GWBUF *stored_event; /*< Buffer where partial events are stored */
uint64_t last_safe_pos; /* last committed transaction */ uint64_t last_safe_pos; /* last committed transaction */
char binlog_name[BINLOG_FNAMELEN + 1]; char binlog_name[BINLOG_FNAMELEN + 1];
@ -738,7 +741,7 @@ typedef struct slave_encryption_ctx
char *log_file; /**< The log file the client has requested */ char *log_file; /**< The log file the client has requested */
uint32_t first_enc_event_pos; /**< The position of first encrypted event uint32_t first_enc_event_pos; /**< The position of first encrypted event
* It's the first event afte Start_encryption_event * It's the first event afte Start_encryption_event
* Which is after FDE */ * which is after FDE */
} SLAVE_ENCRYPTION_CTX; } SLAVE_ENCRYPTION_CTX;
/** /**
@ -907,7 +910,7 @@ static char *blrs_states[] =
*/ */
#define COM_QUIT 0x01 #define COM_QUIT 0x01
#define COM_QUERY 0x03 #define COM_QUERY 0x03
#define COM_STATISTIC 0x09 #define COM_STATISTICS 0x09
#define COM_PING 0x0e #define COM_PING 0x0e
#define COM_REGISTER_SLAVE 0x15 #define COM_REGISTER_SLAVE 0x15
#define COM_BINLOG_DUMP 0x12 #define COM_BINLOG_DUMP 0x12
@ -963,8 +966,10 @@ extern void blr_file_flush(ROUTER_INSTANCE *);
extern BLFILE *blr_open_binlog(ROUTER_INSTANCE *, extern BLFILE *blr_open_binlog(ROUTER_INSTANCE *,
const char *, const char *,
const MARIADB_GTID_INFO *); const MARIADB_GTID_INFO *);
extern GWBUF *blr_read_binlog(ROUTER_INSTANCE *, BLFILE *, extern GWBUF *blr_read_binlog(ROUTER_INSTANCE *,
unsigned long, REP_HEADER *, BLFILE *,
unsigned long,
REP_HEADER *,
char *, char *,
const SLAVE_ENCRYPTION_CTX *); const SLAVE_ENCRYPTION_CTX *);
extern void blr_close_binlog(ROUTER_INSTANCE *, BLFILE *); extern void blr_close_binlog(ROUTER_INSTANCE *, BLFILE *);

113
server/modules/routing/binlogrouter/blr_slave.c
View File

@ -165,8 +165,10 @@ static int blr_slave_send_fieldcount(ROUTER_INSTANCE *router,
int count); int count);
static int blr_slave_send_columndef(ROUTER_INSTANCE *router, static int blr_slave_send_columndef(ROUTER_INSTANCE *router,
ROUTER_SLAVE *slave, ROUTER_SLAVE *slave,
char *name, int type, const char *name,
int len, uint8_t seqno); int type,
int len,
uint8_t seqno);
static int blr_slave_send_eof(ROUTER_INSTANCE *router, static int blr_slave_send_eof(ROUTER_INSTANCE *router,
ROUTER_SLAVE *slave, ROUTER_SLAVE *slave,
int seqno); int seqno);
@ -1091,7 +1093,7 @@ blr_slave_send_master_status(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave)
/* /*
* Columns to send for a "SHOW SLAVE STATUS" command * Columns to send for a "SHOW SLAVE STATUS" command
*/ */
static char *slave_status_columns[] = static const char *slave_status_columns[] =
{ {
"Slave_IO_State", "Slave_IO_State",
"Master_Host", "Master_Host",
@ -1144,6 +1146,24 @@ static char *slave_status_columns[] =
"Last_SQL_Error_Timestamp", "Last_SQL_Error_Timestamp",
"Master_SSL_Crl", "Master_SSL_Crl",
"Master_SSL_Crlpath", "Master_SSL_Crlpath",
NULL
};
/*
* New columns to send for a "SHOW ALL SLAVES STATUS" command
*/
static const char *all_slaves_status_columns[] =
{
"Connection_name",
"Slave_SQL_State",
NULL
};
/*
* Columns to send for GTID in "SHOW SLAVE STATUS" MySQL 5.6/7 command
*/
static const char *mysql_gtid_status_columns[] =
{
"Retrieved_Gtid_Set", "Retrieved_Gtid_Set",
"Executed_Gtid_Set", "Executed_Gtid_Set",
"Auto_Position", "Auto_Position",
@ -1151,12 +1171,13 @@ static char *slave_status_columns[] =
}; };
/* /*
* New columns to send for a "SHOW ALL SLAVES STATUS" command * Columns to send for GTID in "SHOW SLAVE STATUS" MariaDB 10 command
* and SHOW ALL SLAVES STATUS as well
*/ */
static char *all_slaves_status_columns[] = static const char *mariadb10_gtid_status_columns[] =
{ {
"Connection_name", "Using_Gtid",
"Slave_SQL_State", "Gtid_IO_Pos",
NULL NULL
}; };
@ -1177,24 +1198,40 @@ blr_slave_send_slave_status(ROUTER_INSTANCE *router,
GWBUF *pkt; GWBUF *pkt;
char column[251] = ""; char column[251] = "";
uint8_t *ptr; uint8_t *ptr;
int len, actual_len, col_len, seqno, ncols, i; int len, actual_len, col_len, seqno, i;
char *dyn_column = NULL; char *dyn_column = NULL;
int max_column_size = sizeof(column); int max_column_size = sizeof(column);
int new_cols; int ncols = 0;
int gtid_cols = 0;
/* Count SHOW SLAVE STATUS the columns */ /* Count SHOW SLAVE STATUS the columns */
for (ncols = 0; slave_status_columns[ncols]; ncols++); while (slave_status_columns[ncols])
/* Add the new SHOW ALL SLAVES STATUS columns */
for (new_cols = 0; all_slaves_status_columns[new_cols]; new_cols++);
/* Add the new all_slaves columns to the total */
if (all_slaves)
{ {
ncols += new_cols; ncols++;
} }
/* Add the new SHOW ALL SLAVES STATUS columns */
if (all_slaves)
{
int k = 0;
while (all_slaves_status_columns[k++])
{
ncols++;
}
}
const char **gtid_status_columns = router->mariadb10_gtid ?
mariadb10_gtid_status_columns :
mysql_gtid_status_columns;
/* Increment ncols with the right GTID columns */
while (gtid_status_columns[gtid_cols++])
{
ncols++;
}
/* Send number of columns */
blr_slave_send_fieldcount(router, slave, ncols); blr_slave_send_fieldcount(router, slave, ncols);
seqno = 2; seqno = 2;
if (all_slaves) if (all_slaves)
{ {
@ -1219,6 +1256,19 @@ blr_slave_send_slave_status(ROUTER_INSTANCE *router,
40, 40,
seqno++); seqno++);
} }
/* Send MariaDB 10 or MySQL 5.6/7 GTID columns */
for (i = 0; gtid_status_columns[i]; i++)
{
blr_slave_send_columndef(router,
slave,
gtid_status_columns[i],
BLR_TYPE_STRING,
40,
seqno++);
}
/* Send EOF for columns def */
blr_slave_send_eof(router, slave, seqno++); blr_slave_send_eof(router, slave, seqno++);
// Max length + 250 bytes error message // Max length + 250 bytes error message
@ -1579,10 +1629,29 @@ blr_slave_send_slave_status(ROUTER_INSTANCE *router,
*ptr++ = 0; *ptr++ = 0;
*ptr++ = 0; *ptr++ = 0;
// No GTID support send empty values if (!router->mariadb10_gtid)
*ptr++ = 0; {
*ptr++ = 0; // No GTID support send empty values
*ptr++ = 0; *ptr++ = 0;
*ptr++ = 0;
*ptr++ = 0;
}
else
{
// MariaDB 10 GTID
sprintf(column, "%s", "Slave_pos");
col_len = strlen(column);
*ptr++ = col_len; // Length of result string
memcpy(ptr, column, col_len); // Result string
ptr += col_len;
sprintf(column, "%s", router->last_mariadb_gtid);
col_len = strlen(column);
*ptr++ = col_len; // Length of result string
memcpy(ptr, column, col_len); // Result string
ptr += col_len;
}
*ptr++ = 0; *ptr++ = 0;
actual_len = ptr - (uint8_t *)GWBUF_DATA(pkt); actual_len = ptr - (uint8_t *)GWBUF_DATA(pkt);
@ -2929,7 +2998,7 @@ blr_slave_send_fieldcount(ROUTER_INSTANCE *router,
static int static int
blr_slave_send_columndef(ROUTER_INSTANCE *router, blr_slave_send_columndef(ROUTER_INSTANCE *router,
ROUTER_SLAVE *slave, ROUTER_SLAVE *slave,
char *name, const char *name,
int type, int type,
int len, int len,
uint8_t seqno) uint8_t seqno)