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

MXS-2011 Fix terminology and names

Browse Source 
The variable storing the configuration index renamed from
'current_config' to 'config_index'.

In the code the same terminology is used as in the documentation.
"Default" is is used for referring to the default connections
(earlier "primary" was used) and the secondary connections are
referred to as "secondary" (earlier "alternative" was also used).
This commit is contained in:
Johan Wikman
2018-09-04 09:49:41 +03:00
parent b835befe0f
commit f5b73cf106
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/modules/routing/binlogrouter/blr_master.cc
View File

@ -378,14 +378,14 @@ blr_restart_master(ROUTER_INSTANCE *router)
router->master_state = BLRM_UNCONNECTED;
router->retry_count++;
int current_config = (router->current_config + 1) % router->configs.size();
if (current_config != router->current_config) // Will be different unless there is but one.
int config_index = (router->config_index + 1) % router->configs.size();
if (config_index != router->config_index) // Will be different unless there is but one.
{
mxb_assert(current_config < static_cast<int>(router->configs.size()));
mxb_assert(config_index < static_cast<int>(router->configs.size()));
const ChangeMasterConfig& old_config = router->configs[router->current_config];
router->current_config = current_config;
const ChangeMasterConfig& new_config = router->configs[router->current_config];
const ChangeMasterConfig& old_config = router->configs[router->config_index];
router->config_index = config_index;
const ChangeMasterConfig& new_config = router->configs[router->config_index];
blr_master_set_config(router, new_config);
@ -3112,7 +3112,7 @@ static int blr_check_connect_retry(ROUTER_INSTANCE *router)
}
mxb_assert(router->configs.size() > 0);
if (router->current_config < static_cast<int>(router->configs.size() - 1))
if (router->config_index < static_cast<int>(router->configs.size() - 1))
{
// We have unused configs; no need to sleep anything at all. We will
// sleep only when we have unsuccessfully cycled through all available