From 416211610935cd60fa20b469a7096c3a2e0c1bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 11 Jul 2018 16:24:54 +0300 Subject: [PATCH] Remove router_options from readwritesplit tests The router_options parameter is no longer accepted by readwritesplit. --- maxscale-system-test/cnf/maxscale.cnf.template.add_server | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.add_service | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.alter_router | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.bad_pers | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.batchinsert | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.bug471 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.bug539 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.bug567 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.bug571 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.bug585 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.bug587 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.bug662 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.bug711 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.bug730 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter | 2 +- .../cnf/maxscale.cnf.template.check_backend | 4 ++-- .../cnf/maxscale.cnf.template.config_reload | 2 +- .../cnf/maxscale.cnf.template.connection_limit | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.galera | 2 +- .../cnf/maxscale.cnf.template.galera.bug681 | 2 +- .../cnf/maxscale.cnf.template.galera.weight | 2 +- .../cnf/maxscale.cnf.template.galera_hartmut | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.hartmut | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.hints | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.hints2 | 2 +- .../cnf/maxscale.cnf.template.keepalived.000 | 2 +- .../cnf/maxscale.cnf.template.keepalived.001 | 2 +- .../cnf/maxscale.cnf.template.keepalived_masterdown.000 | 2 +- .../cnf/maxscale.cnf.template.keepalived_masterdown.001 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.kerberos | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.lag | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.load | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.load_galera | 2 +- .../cnf/maxscale.cnf.template.load_galera_pers1 | 2 +- .../cnf/maxscale.cnf.template.load_galera_pers10 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 | 2 +- .../cnf/maxscale.cnf.template.local_address | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.longblob | 2 +- .../cnf/maxscale.cnf.template.longblob_filters | 4 ++-- .../cnf/maxscale.cnf.template.masking_mysqltest | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.master_only | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.maxinfo | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.maxrows | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.mm | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.mm_mysqlmon | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.mxs118 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.mxs127 | 3 ++- .../cnf/maxscale.cnf.template.mxs1457_ignore_deleted | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.mxs361 | 4 ++-- maxscale-system-test/cnf/maxscale.cnf.template.mxs501 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.mxs548 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.mxs559 | 2 +- .../cnf/maxscale.cnf.template.mxs710_bad_socket | 2 +- .../cnf/maxscale.cnf.template.mxs711_two_ports | 2 +- .../cnf/maxscale.cnf.template.mxs720_line_with_no_equal | 2 +- .../cnf/maxscale.cnf.template.mxs720_wierd_line | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.mxs722 | 2 +- .../cnf/maxscale.cnf.template.mxs827_write_timeout | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.mxs874 | 2 +- .../cnf/maxscale.cnf.template.no_ses_cmd_store | 3 ++- maxscale-system-test/cnf/maxscale.cnf.template.open_close | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.pers_01 | 4 ++-- maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.replication | 2 +- .../cnf/maxscale.cnf.template.replication.bug539 | 2 +- .../cnf/maxscale.cnf.template.replication.one_slave | 2 +- .../cnf/maxscale.cnf.template.rwsplit_multi_stmt | 2 +- .../cnf/maxscale.cnf.template.rwsplit_readonly | 6 +++--- maxscale-system-test/cnf/maxscale.cnf.template.script | 4 ++-- .../cnf/maxscale.cnf.template.session_limits | 4 +++- .../cnf/maxscale.cnf.template.show_monitor_crash | 2 +- .../cnf/maxscale.cnf.template.simplejavatest | 2 +- .../cnf/maxscale.cnf.template.sql_queries_pers1 | 2 +- .../cnf/maxscale.cnf.template.sql_queries_pers10 | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.ssl | 2 +- maxscale-system-test/cnf/maxscale.cnf.template.ssl_load | 2 +- .../cnf/maxscale.cnf.template.ssl_load_galera | 2 +- 84 files changed, 95 insertions(+), 91 deletions(-) diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.add_server b/maxscale-system-test/cnf/maxscale.cnf.template.add_server index 5eea68f9c..32665eba8 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.add_server +++ b/maxscale-system-test/cnf/maxscale.cnf.template.add_server @@ -25,7 +25,7 @@ router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.add_service b/maxscale-system-test/cnf/maxscale.cnf.template.add_service index fb36c16d2..9bb52ba46 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.add_service +++ b/maxscale-system-test/cnf/maxscale.cnf.template.add_service @@ -25,7 +25,7 @@ router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.alter_router b/maxscale-system-test/cnf/maxscale.cnf.template.alter_router index 1a117447f..bd079fede 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.alter_router +++ b/maxscale-system-test/cnf/maxscale.cnf.template.alter_router @@ -17,7 +17,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read-Connection-Router-Master] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bad_pers b/maxscale-system-test/cnf/maxscale.cnf.template.bad_pers index f61afb078..c9a255459 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bad_pers +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bad_pers @@ -16,7 +16,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl b/maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl index 0b050ace3..4708dab50 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl @@ -16,7 +16,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql max_slave_connections=100% -router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS +slave_selection_criteria=LEAST_CURRENT_OPERATIONS ssl=required ssl_cert=/###access_homedir###/certs/server-cert.pem ssl_key=/###access_homedir###/certs/server-key.pem diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.batchinsert b/maxscale-system-test/cnf/maxscale.cnf.template.batchinsert index 763a42922..aa783cceb 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.batchinsert +++ b/maxscale-system-test/cnf/maxscale.cnf.template.batchinsert @@ -15,7 +15,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug471 b/maxscale-system-test/cnf/maxscale.cnf.template.bug471 index 4d04fec1b..db4050adf 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug471 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug471 @@ -27,7 +27,7 @@ user=maxskysql password=skysql max_slave_connections=100% use_sql_variables_in=all -router_options=slave_selection_criteria=LEAST_BEHIND_MASTER +slave_selection_criteria=LEAST_BEHIND_MASTER filters=hints|regex diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug539 b/maxscale-system-test/cnf/maxscale.cnf.template.bug539 index 2a2367b39..0bd6cb246 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug539 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug539 @@ -21,7 +21,7 @@ router=readwritesplit servers=server1,server2,server3,server4 max_slave_connections=100% use_sql_variables_in=master -router_options=slave_selection_criteria=LEAST_BEHIND_MASTER +slave_selection_criteria=LEAST_BEHIND_MASTER user=maxskysql password=skysql filters=hints diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug567 b/maxscale-system-test/cnf/maxscale.cnf.template.bug567 index 8a73f0de7..59beee7bc 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug567 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug567 @@ -19,7 +19,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug571 b/maxscale-system-test/cnf/maxscale.cnf.template.bug571 index a88c8d2ba..23f317efb 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug571 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug571 @@ -33,7 +33,7 @@ user=maxskysql password=skysql max_slave_connections=100% use_sql_variables_in=all -router_options=slave_selection_criteria=LEAST_BEHIND_MASTER +slave_selection_criteria=LEAST_BEHIND_MASTER filters=hints|regex|r2 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug585 b/maxscale-system-test/cnf/maxscale.cnf.template.bug585 index 068584dde..a4c3c8d01 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug585 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug585 @@ -29,7 +29,7 @@ user=maxskysql password=skysql max_slave_connections=100% use_sql_variables_in=all -router_options=slave_selection_criteria=LEAST_BEHIND_MASTER +slave_selection_criteria=LEAST_BEHIND_MASTER filters=regex|typo|hints [hints] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug587 b/maxscale-system-test/cnf/maxscale.cnf.template.bug587 index c3e245915..3dee6d5b6 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug587 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug587 @@ -27,7 +27,7 @@ user=maxskysql password=skysql max_slave_connections=100% use_sql_variables_in=all -router_options=slave_selection_criteria=LEAST_BEHIND_MASTER +slave_selection_criteria=LEAST_BEHIND_MASTER filters=hints|regex [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 b/maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 index e41ca7fb3..5857707ad 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 @@ -27,7 +27,7 @@ user=maxskysql password=skysql max_slave_connections=100% use_sql_variables_in=all -router_options=slave_selection_criteria=LEAST_BEHIND_MASTER +slave_selection_criteria=LEAST_BEHIND_MASTER filters=regex|hints [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug662 b/maxscale-system-test/cnf/maxscale.cnf.template.bug662 index 1f14c372e..3909f875f 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug662 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug662 @@ -22,7 +22,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug711 b/maxscale-system-test/cnf/maxscale.cnf.template.bug711 index 00d4995bd..ad7e8430f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug711 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug711 @@ -15,7 +15,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS use_sql_variables_in=all [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug730 b/maxscale-system-test/cnf/maxscale.cnf.template.bug730 index d66abd3b8..0a51b2228 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug730 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug730 @@ -15,7 +15,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS filters=MySetOptionFilter [MySetOptionFilter] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter b/maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter index 7b887818b..fc52ead89 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter +++ b/maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter @@ -28,7 +28,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 filters=ccrfilter diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend b/maxscale-system-test/cnf/maxscale.cnf.template.check_backend index 3d6172a25..b83a8b23e 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend +++ b/maxscale-system-test/cnf/maxscale.cnf.template.check_backend @@ -25,7 +25,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Router Galera] type=service @@ -33,7 +33,7 @@ router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.config_reload b/maxscale-system-test/cnf/maxscale.cnf.template.config_reload index c5eeec155..d3e86e85a 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.config_reload +++ b/maxscale-system-test/cnf/maxscale.cnf.template.config_reload @@ -25,7 +25,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.connection_limit b/maxscale-system-test/cnf/maxscale.cnf.template.connection_limit index ee5074b13..1cc5ccbc5 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.connection_limit +++ b/maxscale-system-test/cnf/maxscale.cnf.template.connection_limit @@ -18,7 +18,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 max_connections=10 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera b/maxscale-system-test/cnf/maxscale.cnf.template.galera index 1564ac0c6..63d4ad10b 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera @@ -16,7 +16,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681 b/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681 index 70d6d5322..66b16c237 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681 @@ -25,7 +25,7 @@ version_string=MariaDBEC-10.0.14 localhost_match_wildcard_host=1 max_slave_connections=10% #max_slave_replication_lag=30 -#router_options=slave_selection_criteria=LEAST_BEHIND_MASTER +#slave_selection_criteria=LEAST_BEHIND_MASTER [Read Connection Router] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight b/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight index 60fb7b2e3..16f03bb8c 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight @@ -16,7 +16,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 weightby=serversize_rws -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 user=maxskysql password=skysql diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut b/maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut index c07bb86bd..ab780aa33 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut @@ -17,7 +17,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper b/maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper index 7407edd15..b4a8cce47 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper +++ b/maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper @@ -21,7 +21,7 @@ router=readwritesplit servers=server1,server2,server3,server4 max_slave_connections=100% use_sql_variables_in=master -router_options=slave_selection_criteria=LEAST_BEHIND_MASTER +slave_selection_criteria=LEAST_BEHIND_MASTER user=maxskysql password=skysql filters=gatekeeper diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.hartmut b/maxscale-system-test/cnf/maxscale.cnf.template.hartmut index af7323c33..3980870ea 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.hartmut +++ b/maxscale-system-test/cnf/maxscale.cnf.template.hartmut @@ -17,7 +17,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_replication_lag=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.hints b/maxscale-system-test/cnf/maxscale.cnf.template.hints index b1152b9ca..4b30346c4 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.hints +++ b/maxscale-system-test/cnf/maxscale.cnf.template.hints @@ -21,7 +21,7 @@ user=maxskysql password=skysql max_slave_connections=100% use_sql_variables_in=all -router_options=slave_selection_criteria=LEAST_BEHIND_MASTER +slave_selection_criteria=LEAST_BEHIND_MASTER filters=hints diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.hints2 b/maxscale-system-test/cnf/maxscale.cnf.template.hints2 index ee94d624b..d962b8502 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.hints2 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.hints2 @@ -21,7 +21,7 @@ user=maxskysql password=skysql max_slave_connections=100% use_sql_variables_in=all -router_options=slave_selection_criteria=LEAST_BEHIND_MASTER +slave_selection_criteria=LEAST_BEHIND_MASTER filters=hints [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 index 6e46c1d1d..89b31ceae 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 @@ -17,7 +17,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=10.2-server1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 index 77840e710..b0848e22b 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 @@ -17,7 +17,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=10.2-server2 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 index 4b22edd43..33ca9856d 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 @@ -18,7 +18,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=10.2-server1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 index 5a78dbcb8..2e1c36042 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 @@ -18,7 +18,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=10.2-server2 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.kerberos b/maxscale-system-test/cnf/maxscale.cnf.template.kerberos index 5df831fff..aa201fadd 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.kerberos +++ b/maxscale-system-test/cnf/maxscale.cnf.template.kerberos @@ -17,7 +17,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.lag b/maxscale-system-test/cnf/maxscale.cnf.template.lag index fdb4ee69b..eb74e5aaa 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.lag +++ b/maxscale-system-test/cnf/maxscale.cnf.template.lag @@ -26,7 +26,7 @@ user=maxskysql password=skysql max_slave_connections=100% use_sql_variables_in=all -router_options=slave_selection_criteria=LEAST_BEHIND_MASTER +slave_selection_criteria=LEAST_BEHIND_MASTER max_slave_replication_lag=20 filters=hints diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load b/maxscale-system-test/cnf/maxscale.cnf.template.load index 801cc98be..a28b749f6 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load @@ -16,7 +16,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql max_slave_connections=100% -router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS +slave_selection_criteria=LEAST_CURRENT_OPERATIONS [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera index 1a2bafa6d..37d921b02 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera @@ -17,7 +17,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql max_slave_connections=100% -router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS +slave_selection_criteria=LEAST_CURRENT_OPERATIONS [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 index 1b873c693..8155a62fc 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 @@ -17,7 +17,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql max_slave_connections=100% -router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS +slave_selection_criteria=LEAST_CURRENT_OPERATIONS [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 index 157fdf948..7c7b3b442 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 @@ -17,7 +17,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql max_slave_connections=100% -router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS +slave_selection_criteria=LEAST_CURRENT_OPERATIONS [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 b/maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 index 8c2ba7cbb..ce5f67cfa 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 @@ -16,7 +16,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql max_slave_connections=100% -router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS +slave_selection_criteria=LEAST_CURRENT_OPERATIONS [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 b/maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 index 760184242..cac575372 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 @@ -16,7 +16,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql max_slave_connections=100% -router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS +slave_selection_criteria=LEAST_CURRENT_OPERATIONS [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.local_address b/maxscale-system-test/cnf/maxscale.cnf.template.local_address index 485898a41..38309b0ee 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.local_address +++ b/maxscale-system-test/cnf/maxscale.cnf.template.local_address @@ -17,7 +17,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.longblob b/maxscale-system-test/cnf/maxscale.cnf.template.longblob index 6416079af..5c87f2e41 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.longblob +++ b/maxscale-system-test/cnf/maxscale.cnf.template.longblob @@ -18,7 +18,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters b/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters index ab2e4e80f..776e8f68a 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters +++ b/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters @@ -18,7 +18,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 #filters=duplicate|hints|regex|ccrfilter|MaxRows|Masking|Cache|namedserverfilter|Database Firewall filters=duplicate @@ -170,7 +170,7 @@ router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Listener Galera] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest b/maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest index f90182ea2..132f04be1 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest +++ b/maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest @@ -17,7 +17,7 @@ router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.master_only b/maxscale-system-test/cnf/maxscale.cnf.template.master_only index 15f883b81..3598d19f9 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.master_only +++ b/maxscale-system-test/cnf/maxscale.cnf.template.master_only @@ -16,7 +16,7 @@ router= readwritesplit servers=server1 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo b/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo index b30571925..815fee07f 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo +++ b/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo @@ -33,7 +33,7 @@ router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd b/maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd index 7fa122ec5..3094fec6d 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd +++ b/maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd @@ -17,7 +17,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxrows b/maxscale-system-test/cnf/maxscale.cnf.template.maxrows index 8de058a57..afb81fc13 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.maxrows +++ b/maxscale-system-test/cnf/maxscale.cnf.template.maxrows @@ -17,7 +17,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 filters=MaxRows diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mm b/maxscale-system-test/cnf/maxscale.cnf.template.mm index d337c6c74..724735069 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mm +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mm @@ -17,7 +17,7 @@ router= readwritesplit servers=server1, server2 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mm_mysqlmon b/maxscale-system-test/cnf/maxscale.cnf.template.mm_mysqlmon index 9c906f51d..2857c5a03 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mm_mysqlmon +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mm_mysqlmon @@ -18,7 +18,7 @@ router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 index 6a8d54c62..0b2de6058 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 @@ -19,7 +19,7 @@ router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 index 9839c2574..158ddaa44 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 @@ -23,7 +23,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs127 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs127 index d7c5760e3..fc71a5168 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs127 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs127 @@ -15,7 +15,8 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS,disable_sescmd_history=YES +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +disable_sescmd_history=true [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted index 6738f4a12..3b53ed15f 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted @@ -16,7 +16,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=master_failure_mode=error_on_write +master_failure_mode=error_on_write [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 index d93aa36bd..a4d633ec0 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 @@ -17,7 +17,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 index 36d679440..5cd5d85ff 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 @@ -16,7 +16,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] type=service @@ -70,7 +70,7 @@ router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Listener Galera] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs501 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs501 index 4a7f44e2e..ba23181b7 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs501 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs501 @@ -16,7 +16,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 filters=duplicate diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs548 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs548 index 43a64c8b6..0e60614ef 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs548 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs548 @@ -16,7 +16,7 @@ router= readwritesplit servers=server1, server2 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs559 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs559 index 792520fc6..25664fa58 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs559 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs559 @@ -18,7 +18,7 @@ router= readwritesplit servers=server1, server2 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs710_bad_socket b/maxscale-system-test/cnf/maxscale.cnf.template.mxs710_bad_socket index 642eac2b3..c783ce7fc 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs710_bad_socket +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs710_bad_socket @@ -17,7 +17,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs711_two_ports b/maxscale-system-test/cnf/maxscale.cnf.template.mxs711_two_ports index 68c2b203f..606e78e15 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs711_two_ports +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs711_two_ports @@ -17,7 +17,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_line_with_no_equal b/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_line_with_no_equal index 20f438a5d..b80c659e0 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_line_with_no_equal +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_line_with_no_equal @@ -16,7 +16,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 line_no_equal diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_wierd_line b/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_wierd_line index 5b1efafe6..6b162bd50 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_wierd_line +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_wierd_line @@ -16,7 +16,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 index 4f1369788..4d171fd45 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 @@ -16,7 +16,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 filters=QLA diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout b/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout index 6e0fae60f..2f9094b66 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout @@ -16,7 +16,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 connection_keepalive=5 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs874 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs874 index 33f198b20..54699f0e6 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs874 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs874 @@ -14,7 +14,7 @@ detect_stale_master=false type=service router=readwritesplit servers=server1,server2,server3 -router_options=disable_sescmd_history=false +disable_sescmd_history=false user=maxskysql password=skysql max_slave_connections=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.no_ses_cmd_store b/maxscale-system-test/cnf/maxscale.cnf.template.no_ses_cmd_store index 80f4d195b..485509a3f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.no_ses_cmd_store +++ b/maxscale-system-test/cnf/maxscale.cnf.template.no_ses_cmd_store @@ -16,7 +16,8 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS,disable_sescmd_history=true +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +disable_sescmd_history=true max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.open_close b/maxscale-system-test/cnf/maxscale.cnf.template.open_close index aa8e0ff85..56d877d61 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.open_close +++ b/maxscale-system-test/cnf/maxscale.cnf.template.open_close @@ -16,7 +16,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 b/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 index ec06bfa63..494359466 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 @@ -16,7 +16,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] type=service @@ -70,7 +70,7 @@ router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Listener Galera] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc b/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc index b14f2f34c..c5ef7a076 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc +++ b/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc @@ -16,7 +16,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication b/maxscale-system-test/cnf/maxscale.cnf.template.replication index 589b890ff..b3eafebe4 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.replication +++ b/maxscale-system-test/cnf/maxscale.cnf.template.replication @@ -17,7 +17,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 b/maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 index b335ed73c..67f17ff75 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 @@ -12,7 +12,7 @@ router=readwritesplit servers=server1,server2,server3,server4 max_slave_connections=100% use_sql_variables_in=master -router_options=slave_selection_criteria=LEAST_BEHIND_MASTER +slave_selection_criteria=LEAST_BEHIND_MASTER user=maxskysql password=skysql filters=hints diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave b/maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave index c295999cd..a773b8694 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave +++ b/maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave @@ -16,7 +16,7 @@ max_slave_connections=1 servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=disable_sescmd_history=false +disable_sescmd_history=false [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt index 2537783cb..3c4108178 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt +++ b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt @@ -17,7 +17,7 @@ router=readwritesplit servers=server1,server2 user=maxskysql password=skysql -router_options=strict_multi_stmt=true +strict_multi_stmt=true [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly index 0bcf17af6..471ddd317 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly +++ b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly @@ -15,7 +15,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=master_failure_mode=fail_instantly +master_failure_mode=fail_instantly [Read Connection Router Slave] type=service @@ -23,7 +23,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=master_failure_mode=error_on_write +master_failure_mode=error_on_write [Read Connection Router Master] type=service @@ -31,7 +31,7 @@ router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -router_options=master_failure_mode=fail_on_write +master_failure_mode=fail_on_write [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.script b/maxscale-system-test/cnf/maxscale.cnf.template.script index 6bd60549a..7e0d5203a 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.script +++ b/maxscale-system-test/cnf/maxscale.cnf.template.script @@ -30,7 +30,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Router Galera] type=service @@ -38,7 +38,7 @@ router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.session_limits b/maxscale-system-test/cnf/maxscale.cnf.template.session_limits index 785bab8ef..1dac830de 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.session_limits +++ b/maxscale-system-test/cnf/maxscale.cnf.template.session_limits @@ -16,7 +16,9 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS,max_sescmd_history=10,disable_sescmd_history=false +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +max_sescmd_history=10 +disable_sescmd_history=false [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.show_monitor_crash b/maxscale-system-test/cnf/maxscale.cnf.template.show_monitor_crash index 1af5d3cd4..c92181d7f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.show_monitor_crash +++ b/maxscale-system-test/cnf/maxscale.cnf.template.show_monitor_crash @@ -17,7 +17,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest b/maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest index 829fba049..c3a7c2ea4 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest +++ b/maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest @@ -16,7 +16,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS +slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=5.5.5-10.0.0-mxs diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers1 b/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers1 index 326ba4583..d3311e776 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers1 @@ -16,7 +16,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers10 b/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers10 index 2db44e17f..b20cc8ed6 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers10 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers10 @@ -16,7 +16,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 [Read Connection Router Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ssl b/maxscale-system-test/cnf/maxscale.cnf.template.ssl index 19166fc53..36a8c85b5 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.ssl +++ b/maxscale-system-test/cnf/maxscale.cnf.template.ssl @@ -15,7 +15,7 @@ router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS +slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load index 6ee5c0452..611673cd4 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load +++ b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load @@ -16,7 +16,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql max_slave_connections=100% -router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS +slave_selection_criteria=LEAST_CURRENT_OPERATIONS [Read Connection Router Slave] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera index 6e2791bd2..79f8f1c33 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera +++ b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera @@ -17,7 +17,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql max_slave_connections=100% -router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS +slave_selection_criteria=LEAST_CURRENT_OPERATIONS [Read Connection Router Slave] type=service