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

MXS-2011 First read config, then apply it

Browse Source 
Separating the reading of the config from the process of
applying it allows us to use configs around and later apply
them (e.g. when we decide its time to switch master server).
This commit is contained in:
Johan Wikman
2018-08-30 09:57:32 +03:00
parent 5f809e5066
commit 9ff0eab539
3 changed files with 228 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/routing/binlogrouter/blr.hh
View File

@ -372,10 +372,17 @@ class ChangeMasterConfig
{
public:
ChangeMasterConfig()
: heartbeat_period(BLR_HEARTBEAT_DEFAULT_INTERVAL_VALUE)
: ChangeMasterConfig("")
{
}
ChangeMasterConfig(const char* name)
: connection_name(name)
, heartbeat_period(BLR_HEARTBEAT_DEFAULT_INTERVAL_VALUE)
, connect_retry(BLR_MASTER_CONNECT_RETRY_VALUE)
{
}
std::string connection_name;
std::string host;
int port;
@ -1014,6 +1021,7 @@ extern void blr_log_disabled_heartbeat(const ROUTER_INSTANCE *inst);
extern void blr_master_response(ROUTER_INSTANCE *, GWBUF *);
extern void blr_master_reconnect(ROUTER_INSTANCE *);
extern int blr_master_connected(ROUTER_INSTANCE *);
extern void blr_master_set_config(ROUTER_INSTANCE *, const ChangeMasterConfig& config);
extern int blr_slave_request(ROUTER_INSTANCE *,
ROUTER_SLAVE *,