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

MXS-2011 First check, then change

Browse Source 
By slightly re-arranging things, we do not need to revert
the situation if some parameters are not acceptable, but
can simply return.
This commit is contained in:
Johan Wikman
2018-08-23 14:53:45 +03:00
parent 41e467d543
commit 0e1d2ec1ec
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4202,9 +4202,7 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
"Cannot use MASTER_USE_GTID. " "Cannot use MASTER_USE_GTID. "
"Enable 'mariadb10_master_gtid' option first."); "Enable 'mariadb10_master_gtid' option first.");
blr_abort_change_master(router, MXS_ERROR("%s: %s", router->service->name, error);
current_master,
error);
spinlock_release(&router->lock); spinlock_release(&router->lock);
@ -4214,10 +4212,11 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
/** /**
* Handle connection options * Handle connection options
*/ */
int h_val = -1;
auto& master_heartbeat = change_master.heartbeat_period; auto& master_heartbeat = change_master.heartbeat_period;
if (!master_heartbeat.empty()) if (!master_heartbeat.empty())
{ {
int h_val = (int)strtol(master_heartbeat.c_str(), NULL, 10); h_val = (int)strtol(master_heartbeat.c_str(), NULL, 10);
if (h_val < 0 || if (h_val < 0 ||
(errno == ERANGE) || (errno == ERANGE) ||
@ -4230,29 +4229,20 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
"(%d seconds).", "(%d seconds).",
BLR_HEARTBEAT_MAX_INTERVAL); BLR_HEARTBEAT_MAX_INTERVAL);
blr_abort_change_master(router, MXS_ERROR("%s: %s", router->service->name, error);
current_master,
error);
spinlock_release(&router->lock); spinlock_release(&router->lock);
return -1; return -1;
} }
else
{
if (h_val == 0)
{
blr_log_disabled_heartbeat(router);
}
router->heartbeat = h_val;
}
} }
int r_val = -1;
auto& master_connect_retry = change_master.connect_retry; auto& master_connect_retry = change_master.connect_retry;
if (!master_connect_retry.empty()) if (!master_connect_retry.empty())
{ {
int h_val = (int)strtol(master_connect_retry.c_str(), NULL, 10); r_val = (int)strtol(master_connect_retry.c_str(), NULL, 10);
if (h_val <= 0 || if (r_val <= 0 ||
(errno == ERANGE)) (errno == ERANGE))
{ {
snprintf(error, snprintf(error,
@ -4261,18 +4251,28 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
"interval is not valid: %s.", "interval is not valid: %s.",
master_connect_retry.c_str()); master_connect_retry.c_str());
blr_abort_change_master(router, MXS_ERROR("%s: %s", router->service->name, error);
current_master,
error);
spinlock_release(&router->lock); spinlock_release(&router->lock);
return -1; return -1;
} }
else }
/* Change the heartbeat */
if (h_val != -1)
{
if (h_val == 0)
{ {
router->retry_interval = h_val; blr_log_disabled_heartbeat(router);
} }
router->heartbeat = h_val;
}
/* Change the connect retry */
if (r_val != -1)
{
router->retry_interval = r_val;
} }
/* Change the replication user */ /* Change the replication user */