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

MXS-2011 Change invalid asserts

Browse Source 
With multiple configs, we can no longer assert that the config
of the primary, aka first, config is identical with the one
being used.
This commit is contained in:
Johan Wikman 2018-09-03 11:15:35 +03:00
parent 812d80e403
commit 4789f3f193
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/modules/routing/binlogrouter/blr_file.cc
View File

@ -3430,25 +3430,30 @@ blr_file_write_master_config(ROUTER_INSTANCE *router, char *error)
// Assert that the configurarion as dispersed around blr and
// as stored in the configuration item are identical.
mxb_assert(router->configs.size() > 0);
ChangeMasterConfig primary = router->configs.front();
mxb_assert(router->current_config < static_cast<int>(router->configs.size()));
#ifdef SS_DEBUG
const ChangeMasterConfig& current = router->configs[router->current_config];
mxb_assert(primary.host == router->service->dbref->server->address);
mxb_assert(primary.port == router->service->dbref->server->port);
mxb_assert(primary.user == router->user);
mxb_assert(primary.password == router->password);
mxb_assert(current.host == router->service->dbref->server->address);
mxb_assert(current.port == router->service->dbref->server->port);
mxb_assert(current.user == router->user);
mxb_assert(current.password == router->password);
if (router->ssl_enabled)
{
mxb_assert(primary.ssl_enabled);
mxb_assert(primary.ssl_ca == router->service->dbref->server->server_ssl->ssl_ca_cert);
mxb_assert(primary.ssl_cert == router->service->dbref->server->server_ssl->ssl_cert);
mxb_assert(primary.ssl_key == router->service->dbref->server->server_ssl->ssl_key);
mxb_assert(current.ssl_enabled);
mxb_assert(current.ssl_ca == router->service->dbref->server->server_ssl->ssl_ca_cert);
mxb_assert(current.ssl_cert == router->service->dbref->server->server_ssl->ssl_cert);
mxb_assert(current.ssl_key == router->service->dbref->server->server_ssl->ssl_key);
}
mxb_assert(!router->ssl_version || (primary.ssl_version == router->ssl_version));
mxb_assert(!router->ssl_version || (current.ssl_version == router->ssl_version));
mxb_assert(primary.heartbeat_period == (int)router->heartbeat);
mxb_assert(primary.connect_retry == router->retry_interval);
mxb_assert(current.heartbeat_period == (int)router->heartbeat);
mxb_assert(current.connect_retry == router->retry_interval);
#endif
ChangeMasterConfig primary = router->configs[0]; // Copied, so that it can be modified.
// If not SSL enabled, store old SSL config if there is one.
// TODO: Why?