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

MXS-2220 Move server_update_address inside class

Browse Source 
Should be moved to internal class once blr is cleaned up.
This commit is contained in:
Esa Korhonen
2019-01-07 17:55:40 +02:00
parent 46eddc8102
commit df17619722
6 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3206,7 +3206,7 @@ void blr_master_set_config(ROUTER_INSTANCE* inst, const ChangeMasterConfig& conf
if (!config.host.empty())
{
server_update_address(backend_server, config.host.c_str());
backend_server->server_update_address(config.host);
}
if (config.port)

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

@ -4655,7 +4655,7 @@ static int blr_set_master_hostname(ROUTER_INSTANCE* router, const char* hostname
{
mxb_assert((*hostname != '\'') && (*hostname != '"'));
server_update_address(router->service->dbref->server, hostname);
router->service->dbref->server->server_update_address(hostname);
MXS_INFO("%s: New MASTER_HOST is [%s]",
router->service->name,
@ -4883,7 +4883,7 @@ static void blr_master_get_config(ROUTER_INSTANCE* router, MasterServerConfig* c
static void blr_master_restore_config(ROUTER_INSTANCE* router,
const MasterServerConfig& prev_master)
{
server_update_address(router->service->dbref->server, prev_master.host.c_str());
router->service->dbref->server->server_update_address(prev_master.host);
router->service->dbref->server->update_port(prev_master.port);
router->ssl_enabled = prev_master.ssl_enabled;
@ -4903,7 +4903,7 @@ static void blr_master_restore_config(ROUTER_INSTANCE* router,
*/
static void blr_master_set_empty_config(ROUTER_INSTANCE* router)
{
server_update_address(router->service->dbref->server, "none");
router->service->dbref->server->server_update_address("none");
router->service->dbref->server->update_port(3306);
router->current_pos = 4;
@ -4925,7 +4925,7 @@ static void blr_master_set_empty_config(ROUTER_INSTANCE* router)
*/
static void blr_master_apply_config(ROUTER_INSTANCE* router, const MasterServerConfig& prev_master)
{
server_update_address(router->service->dbref->server, prev_master.host.c_str());
router->service->dbref->server->server_update_address(prev_master.host);
router->service->dbref->server->update_port(prev_master.port);
router->current_pos = prev_master.pos;
router->binlog_position = prev_master.safe_pos;