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

MXS-2329 Use durations with max_retry_interval

Browse Source
This commit is contained in:
Johan Wikman 2019-04-29 12:16:46 +03:00
parent 75fbcc9393
commit 93e130bb48
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/Getting-Started/Configuration-Guide.md
View File

@ -1450,6 +1450,12 @@ seconds. The interval is incremented until the value of `max_retry_interval` is
reached at which point the listener attempts to bind to the interface every
`max_retry_interval` seconds.
The value is specified as documented [here](#durations). If no explicit unit
is provided, the value is interpreted as seconds in MaxScale 2.4. In subsequent
versions a value without a unit may be rejected. Note that since the granularity
of the interval is seconds, an interval specified in milliseconds will be rejected,
even if the duration is longer than a second.
#### `session_track_trx_state`
Enable or disable session transaction state tracking by offloading it to the backend servers.

5
server/core/config.cc
View File

@ -334,8 +334,9 @@ const MXS_MODULE_PARAM config_service_params[] =
},
{
CN_MAX_RETRY_INTERVAL,
MXS_MODULE_PARAM_COUNT,
"3600"
MXS_MODULE_PARAM_DURATION,
"3600s",
MXS_MODULE_OPT_DURATION_S
},
{
CN_MAX_CONNECTIONS,

2
server/core/service.cc
View File

@ -214,7 +214,7 @@ Service::Service(const std::string& name,
snprintf(weightby, sizeof(weightby), "%s", m_weightby.c_str());
snprintf(version_string, sizeof(version_string), "%s", m_version_string.c_str());
max_retry_interval = params->get_integer(CN_MAX_RETRY_INTERVAL);
max_retry_interval = params->get_duration<std::chrono::seconds>(CN_MAX_RETRY_INTERVAL).count();
users_from_all = params->get_bool(CN_AUTH_ALL_SERVERS);
localhost_match_wildcard_host = params->get_bool(CN_LOCALHOST_MATCH_WILDCARD_HOST);
retry_start = params->get_bool(CN_RETRY_ON_FAILURE);