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

Revert "MXS-2920: Allow max_slave_replication_lag=0"

Browse Source 
This reverts commit ca69da49911074a9d218f05936282fd72a674af5 and removes
the bug from the release notes.
This commit is contained in:
Markus Mäkelä
2020-03-17 06:57:45 +02:00
parent f5b61e169b
commit 9609f5d180
4 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/Release-Notes/MaxScale-2.4.8-Release-Notes.md
View File

@ -11,7 +11,6 @@ report on [our Jira](https://jira.mariadb.org/projects/MXS).
## Bug fixes ## Bug fixes
* [MXS-2921](https://jira.mariadb.org/browse/MXS-2921) Memory leak in `alter maxscale` * [MXS-2921](https://jira.mariadb.org/browse/MXS-2921) Memory leak in `alter maxscale`
* [MXS-2920](https://jira.mariadb.org/browse/MXS-2920) Cannot set max_slave_replication_lag=0
* [MXS-2919](https://jira.mariadb.org/browse/MXS-2919) max_slave_replication_lag uses servers with unknown replication lag * [MXS-2919](https://jira.mariadb.org/browse/MXS-2919) max_slave_replication_lag uses servers with unknown replication lag
* [MXS-2917](https://jira.mariadb.org/browse/MXS-2917) qc_sqlite leaks memory with complex CREATE TABLE query * [MXS-2917](https://jira.mariadb.org/browse/MXS-2917) qc_sqlite leaks memory with complex CREATE TABLE query
* [MXS-2907](https://jira.mariadb.org/browse/MXS-2907) Logrotate warnings when PID file does not exist * [MXS-2907](https://jira.mariadb.org/browse/MXS-2907) Logrotate warnings when PID file does not exist

7
server/modules/routing/readwritesplit/readwritesplit.cc
View File

@ -502,12 +502,7 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
MXS_MODULE_OPT_NONE, MXS_MODULE_OPT_NONE,
master_failure_mode_values master_failure_mode_values
}, },
{ {"max_slave_replication_lag", MXS_MODULE_PARAM_DURATION, "0s", MXS_MODULE_OPT_DURATION_S},
"max_slave_replication_lag",
MXS_MODULE_PARAM_DURATION,
DEFAULT_MAX_SLAVE_REPLICATION_LAG_STR,
MXS_MODULE_OPT_DURATION_S
},
{"max_slave_connections", MXS_MODULE_PARAM_STRING, MAX_SLAVE_COUNT}, {"max_slave_connections", MXS_MODULE_PARAM_STRING, MAX_SLAVE_COUNT},
{"retry_failed_reads", MXS_MODULE_PARAM_BOOL, "true"}, {"retry_failed_reads", MXS_MODULE_PARAM_BOOL, "true"},
{"prune_sescmd_history", MXS_MODULE_PARAM_BOOL, "false"}, {"prune_sescmd_history", MXS_MODULE_PARAM_BOOL, "false"},

3
server/modules/routing/readwritesplit/readwritesplit.hh
View File

@ -124,9 +124,6 @@ static const char gtid_wait_stmt[] =
"SET @maxscale_secret_variable=(SELECT CASE WHEN %s('%s', %s) = 0 " "SET @maxscale_secret_variable=(SELECT CASE WHEN %s('%s', %s) = 0 "
"THEN 1 ELSE (SELECT 1 FROM INFORMATION_SCHEMA.ENGINES) END);"; "THEN 1 ELSE (SELECT 1 FROM INFORMATION_SCHEMA.ENGINES) END);";
static const char DEFAULT_MAX_SLAVE_REPLICATION_LAG_STR[] = "2147483647s";
static const int DEFAULT_MAX_SLAVE_REPLICATION_LAG = 2147483647;
/** Function that returns a "score" for a server to enable comparison. /** Function that returns a "score" for a server to enable comparison.
* Smaller numbers are better. * Smaller numbers are better.
*/ */

2
server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
View File

@ -735,7 +735,7 @@ int RWSplitSession::get_max_replication_lag()
int conf_max_rlag = SERVER::RLAG_UNDEFINED; int conf_max_rlag = SERVER::RLAG_UNDEFINED;
/** if there is no configured value, then longest possible int is used */ /** if there is no configured value, then longest possible int is used */
if (m_config.max_slave_replication_lag != DEFAULT_MAX_SLAVE_REPLICATION_LAG) if (m_config.max_slave_replication_lag > 0)
{ {
conf_max_rlag = m_config.max_slave_replication_lag; conf_max_rlag = m_config.max_slave_replication_lag;
} }