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

MXS-2011 Introduce blr_apply_change_master()

Browse Source 
This function applies a change master config. Currently is
used from blr_handle_change_master(), and subsequently will
be used when BLR switches to an alternative master.
This commit is contained in:
Johan Wikman
2018-08-23 17:29:49 +03:00
parent 8f26e3cbaf
commit 1aad1ae7d7
1 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
server/modules/routing/binlogrouter/blr_slave.cc
View File

@ -159,6 +159,9 @@ static void blr_slave_send_error_packet(ROUTER_SLAVE *slave,
const char *msg,
unsigned int err_num,
const char *status);
static int blr_apply_change_master(ROUTER_INSTANCE* router,
const ChangeMasterConfig& new_config,
char* error);
static int blr_handle_change_master(ROUTER_INSTANCE* router,
char *command,
char *error);
@ -4224,51 +4227,10 @@ bool ChangeMasterOptions::validate(ROUTER_INSTANCE* router,
return true;
}
/**
* handle a 'change master' operation
*
* @param router The router instance
* @param command The change master SQL command
* @param error The error message, preallocated
* BINLOG_ERROR_MSG_LEN + 1 bytes
* @return 0 on success,
* 1 on success with new binlog, -1 on failure
*/
static
int blr_handle_change_master(ROUTER_INSTANCE* router,
char *command,
char *error)
static int blr_apply_change_master(ROUTER_INSTANCE* router,
const ChangeMasterConfig& new_config,
char* error)
{
char* cmd_ptr = strcasestr(command, "TO");
if (!cmd_ptr)
{
static const char MESSAGE[] = "statement doesn't have the CHANGE MASTER TO syntax";
mxb_assert(sizeof(MESSAGE) <= BINLOG_ERROR_MSG_LEN);
strcpy(error, MESSAGE);
return -1;
}
std::vector<char> cmd_string(cmd_ptr + 2, cmd_ptr + strlen(cmd_ptr) + 1);
/* Parse SQL command and populate the change_master struct */
ChangeMasterOptions new_options;
if (blr_parse_change_master_command(&cmd_string.front(),
error,
&new_options) != 0)
{
MXS_ERROR("%s CHANGE MASTER TO parse error: %s",
router->service->name,
error);
return -1;
}
ChangeMasterConfig new_config;
if (!new_options.validate(router, error, &new_config))
{
return -1;
}
MasterServerConfig current_master;
spinlock_acquire(&router->lock);
@ -4379,6 +4341,54 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
return change_binlog;
}
/**
* handle a 'change master' operation
*
* @param router The router instance
* @param command The change master SQL command
* @param error The error message, preallocated
* BINLOG_ERROR_MSG_LEN + 1 bytes
* @return 0 on success,
* 1 on success with new binlog, -1 on failure
*/
static
int blr_handle_change_master(ROUTER_INSTANCE* router,
char *command,
char *error)
{
char* cmd_ptr = strcasestr(command, "TO");
if (!cmd_ptr)
{
static const char MESSAGE[] = "statement doesn't have the CHANGE MASTER TO syntax";
mxb_assert(sizeof(MESSAGE) <= BINLOG_ERROR_MSG_LEN);
strcpy(error, MESSAGE);
return -1;
}
std::vector<char> cmd_string(cmd_ptr + 2, cmd_ptr + strlen(cmd_ptr) + 1);
/* Parse SQL command and populate the change_master struct */
ChangeMasterOptions new_options;
if (blr_parse_change_master_command(&cmd_string.front(),
error,
&new_options) != 0)
{
MXS_ERROR("%s CHANGE MASTER TO parse error: %s",
router->service->name,
error);
return -1;
}
ChangeMasterConfig new_config;
if (!new_options.validate(router, error, &new_config))
{
return -1;
}
return blr_apply_change_master(router, new_config, error);
}
/*
* Set new master hostname
*