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

MXS-2329 Use durations with BLR:[heartbeat|connect_retry]

Browse Source
This commit is contained in:
Johan Wikman
2019-04-29 12:50:33 +03:00
parent b1a495b342
commit 0f5972e010
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/modules/routing/binlogrouter/blr.cc
View File

@ -211,10 +211,14 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
DEF_LONG_BURST},
{"burstsize", MXS_MODULE_PARAM_SIZE,
DEF_BURST_SIZE},
{"heartbeat", MXS_MODULE_PARAM_COUNT,
BLR_HEARTBEAT_DEFAULT_INTERVAL},
{"connect_retry", MXS_MODULE_PARAM_COUNT,
BLR_MASTER_CONNECT_RETRY},
{"heartbeat", MXS_MODULE_PARAM_DURATION,
BLR_HEARTBEAT_DEFAULT_INTERVAL "s",
MXS_MODULE_OPT_DURATION_S
},
{"connect_retry", MXS_MODULE_PARAM_DURATION,
BLR_MASTER_CONNECT_RETRY "s",
MXS_MODULE_OPT_DURATION_S
},
{"master_retry_count", MXS_MODULE_PARAM_COUNT,
BLR_MASTER_RETRY_COUNT},
{"send_slave_heartbeat", MXS_MODULE_PARAM_BOOL,
@ -345,8 +349,8 @@ static MXS_ROUTER* createInstance(SERVICE* service, MXS_CONFIG_PARAMETER* params
inst->long_burst = params->get_integer("longburst");
inst->burst_size = params->get_size("burstsize");
inst->binlogdir = params->get_c_str_copy("binlogdir");
inst->heartbeat = params->get_integer("heartbeat");
inst->retry_interval = params->get_integer("connect_retry");
inst->heartbeat = params->get_duration<std::chrono::seconds>("heartbeat").count();
inst->retry_interval = params->get_duration<std::chrono::seconds>("connect_retry").count();
inst->retry_limit = params->get_integer("master_retry_count");
inst->ssl_cert_verification_depth = params->get_integer("ssl_cert_verification_depth");
inst->mariadb10_compat = params->get_bool("mariadb10-compatibility");