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

Remove router_options from readwritesplit tests

Browse Source 
The router_options parameter is no longer accepted by readwritesplit.
This commit is contained in:
Markus Mäkelä
2018-07-11 16:24:54 +03:00
parent 5fdf82a508
commit 4162116109
84 changed files with 95 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxscale-system-test/cnf/maxscale.cnf.template.add_server
View File

@ -25,7 +25,7 @@ router= readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[RW Split Listener] [RW Split Listener]
type=listener type=listener

2
maxscale-system-test/cnf/maxscale.cnf.template.add_service
View File

@ -25,7 +25,7 @@ router= readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[RW Split Listener] [RW Split Listener]
type=listener type=listener

2
maxscale-system-test/cnf/maxscale.cnf.template.alter_router
View File

@ -17,7 +17,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read-Connection-Router-Master] [Read-Connection-Router-Master]

2
maxscale-system-test/cnf/maxscale.cnf.template.bad_pers
View File

@ -16,7 +16,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl
View File

@ -16,7 +16,7 @@ servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS slave_selection_criteria=LEAST_CURRENT_OPERATIONS
ssl=required ssl=required
ssl_cert=/###access_homedir###/certs/server-cert.pem ssl_cert=/###access_homedir###/certs/server-cert.pem
ssl_key=/###access_homedir###/certs/server-key.pem ssl_key=/###access_homedir###/certs/server-key.pem

2
maxscale-system-test/cnf/maxscale.cnf.template.batchinsert
View File

@ -15,7 +15,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.bug471
View File

@ -27,7 +27,7 @@ user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
use_sql_variables_in=all use_sql_variables_in=all
router_options=slave_selection_criteria=LEAST_BEHIND_MASTER slave_selection_criteria=LEAST_BEHIND_MASTER
filters=hints|regex filters=hints|regex

2
maxscale-system-test/cnf/maxscale.cnf.template.bug539
View File

@ -21,7 +21,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
max_slave_connections=100% max_slave_connections=100%
use_sql_variables_in=master use_sql_variables_in=master
router_options=slave_selection_criteria=LEAST_BEHIND_MASTER slave_selection_criteria=LEAST_BEHIND_MASTER
user=maxskysql user=maxskysql
password=skysql password=skysql
filters=hints filters=hints

2
maxscale-system-test/cnf/maxscale.cnf.template.bug567
View File

@ -19,7 +19,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.bug571
View File

@ -33,7 +33,7 @@ user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
use_sql_variables_in=all use_sql_variables_in=all
router_options=slave_selection_criteria=LEAST_BEHIND_MASTER slave_selection_criteria=LEAST_BEHIND_MASTER
filters=hints|regex|r2 filters=hints|regex|r2

2
maxscale-system-test/cnf/maxscale.cnf.template.bug585
View File

@ -29,7 +29,7 @@ user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
use_sql_variables_in=all use_sql_variables_in=all
router_options=slave_selection_criteria=LEAST_BEHIND_MASTER slave_selection_criteria=LEAST_BEHIND_MASTER
filters=regex|typo|hints filters=regex|typo|hints
[hints] [hints]

2
maxscale-system-test/cnf/maxscale.cnf.template.bug587
View File

@ -27,7 +27,7 @@ user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
use_sql_variables_in=all use_sql_variables_in=all
router_options=slave_selection_criteria=LEAST_BEHIND_MASTER slave_selection_criteria=LEAST_BEHIND_MASTER
filters=hints|regex filters=hints|regex
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.bug587_1
View File

@ -27,7 +27,7 @@ user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
use_sql_variables_in=all use_sql_variables_in=all
router_options=slave_selection_criteria=LEAST_BEHIND_MASTER slave_selection_criteria=LEAST_BEHIND_MASTER
filters=regex|hints filters=regex|hints
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.bug662
View File

@ -22,7 +22,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.bug711
View File

@ -15,7 +15,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
use_sql_variables_in=all use_sql_variables_in=all
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.bug730
View File

@ -15,7 +15,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
filters=MySetOptionFilter filters=MySetOptionFilter
[MySetOptionFilter] [MySetOptionFilter]

2
maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter
View File

@ -28,7 +28,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
filters=ccrfilter filters=ccrfilter

4
maxscale-system-test/cnf/maxscale.cnf.template.check_backend
View File

@ -25,7 +25,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[RW Split Router Galera] [RW Split Router Galera]
type=service type=service
@ -33,7 +33,7 @@ router= readwritesplit
servers=gserver1,gserver2,gserver3,gserver4 servers=gserver1,gserver2,gserver3,gserver4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.config_reload
View File

@ -25,7 +25,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[RW Split Listener] [RW Split Listener]
type=listener type=listener

2
maxscale-system-test/cnf/maxscale.cnf.template.connection_limit
View File

@ -18,7 +18,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
max_connections=10 max_connections=10

2
maxscale-system-test/cnf/maxscale.cnf.template.galera
View File

@ -16,7 +16,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681
View File

@ -25,7 +25,7 @@ version_string=MariaDBEC-10.0.14
localhost_match_wildcard_host=1 localhost_match_wildcard_host=1
max_slave_connections=10% max_slave_connections=10%
#max_slave_replication_lag=30 #max_slave_replication_lag=30
#router_options=slave_selection_criteria=LEAST_BEHIND_MASTER #slave_selection_criteria=LEAST_BEHIND_MASTER
[Read Connection Router] [Read Connection Router]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.galera.weight
View File

@ -16,7 +16,7 @@ type=service
router=readwritesplit router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
weightby=serversize_rws weightby=serversize_rws
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
user=maxskysql user=maxskysql
password=skysql password=skysql

2
maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut
View File

@ -17,7 +17,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper
View File

@ -21,7 +21,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
max_slave_connections=100% max_slave_connections=100%
use_sql_variables_in=master use_sql_variables_in=master
router_options=slave_selection_criteria=LEAST_BEHIND_MASTER slave_selection_criteria=LEAST_BEHIND_MASTER
user=maxskysql user=maxskysql
password=skysql password=skysql
filters=gatekeeper filters=gatekeeper

2
maxscale-system-test/cnf/maxscale.cnf.template.hartmut
View File

@ -17,7 +17,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
max_slave_replication_lag=1 max_slave_replication_lag=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.hints
View File

@ -21,7 +21,7 @@ user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
use_sql_variables_in=all use_sql_variables_in=all
router_options=slave_selection_criteria=LEAST_BEHIND_MASTER slave_selection_criteria=LEAST_BEHIND_MASTER
filters=hints filters=hints

2
maxscale-system-test/cnf/maxscale.cnf.template.hints2
View File

@ -21,7 +21,7 @@ user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
use_sql_variables_in=all use_sql_variables_in=all
router_options=slave_selection_criteria=LEAST_BEHIND_MASTER slave_selection_criteria=LEAST_BEHIND_MASTER
filters=hints filters=hints
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000
View File

@ -17,7 +17,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
version_string=10.2-server1 version_string=10.2-server1

2
maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001
View File

@ -17,7 +17,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
version_string=10.2-server2 version_string=10.2-server2

2
maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000
View File

@ -18,7 +18,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
version_string=10.2-server1 version_string=10.2-server1

2
maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001
View File

@ -18,7 +18,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
version_string=10.2-server2 version_string=10.2-server2

2
maxscale-system-test/cnf/maxscale.cnf.template.kerberos
View File

@ -17,7 +17,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.lag
View File

@ -26,7 +26,7 @@ user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
use_sql_variables_in=all use_sql_variables_in=all
router_options=slave_selection_criteria=LEAST_BEHIND_MASTER slave_selection_criteria=LEAST_BEHIND_MASTER
max_slave_replication_lag=20 max_slave_replication_lag=20
filters=hints filters=hints

2
maxscale-system-test/cnf/maxscale.cnf.template.load
View File

@ -16,7 +16,7 @@ servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS slave_selection_criteria=LEAST_CURRENT_OPERATIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.load_galera
View File

@ -17,7 +17,7 @@ servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS slave_selection_criteria=LEAST_CURRENT_OPERATIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1
View File

@ -17,7 +17,7 @@ servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS slave_selection_criteria=LEAST_CURRENT_OPERATIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10
View File

@ -17,7 +17,7 @@ servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS slave_selection_criteria=LEAST_CURRENT_OPERATIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.load_pers1
View File

@ -16,7 +16,7 @@ servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS slave_selection_criteria=LEAST_CURRENT_OPERATIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.load_pers10
View File

@ -16,7 +16,7 @@ servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS slave_selection_criteria=LEAST_CURRENT_OPERATIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.local_address
View File

@ -17,7 +17,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.longblob
View File

@ -18,7 +18,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

4
maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters
View File

@ -18,7 +18,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
#filters=duplicate|hints|regex|ccrfilter|MaxRows|Masking|Cache|namedserverfilter|Database Firewall #filters=duplicate|hints|regex|ccrfilter|MaxRows|Masking|Cache|namedserverfilter|Database Firewall
filters=duplicate filters=duplicate
@ -170,7 +170,7 @@ router= readwritesplit
servers=gserver1,gserver2,gserver3,gserver4 servers=gserver1,gserver2,gserver3,gserver4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[RW Split Listener Galera] [RW Split Listener Galera]
type=listener type=listener

2
maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest
View File

@ -17,7 +17,7 @@ router= readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.master_only
View File

@ -16,7 +16,7 @@ router= readwritesplit
servers=server1 servers=server1
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.maxinfo
View File

@ -33,7 +33,7 @@ router= readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd
View File

@ -17,7 +17,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.maxrows
View File

@ -17,7 +17,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
filters=MaxRows filters=MaxRows

2
maxscale-system-test/cnf/maxscale.cnf.template.mm
View File

@ -17,7 +17,7 @@ router= readwritesplit
servers=server1, server2 servers=server1, server2
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.mm_mysqlmon
View File

@ -18,7 +18,7 @@ router= readwritesplit
servers=server1, server2, server3, server4 servers=server1, server2, server3, server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs1045
View File

@ -19,7 +19,7 @@ router= readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs118
View File

@ -23,7 +23,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

3
maxscale-system-test/cnf/maxscale.cnf.template.mxs127
View File

@ -15,7 +15,8 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql 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] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted
View File

@ -16,7 +16,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=master_failure_mode=error_on_write master_failure_mode=error_on_write
[RW Split Listener] [RW Split Listener]
type=listener type=listener

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs1889
View File

@ -17,7 +17,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

4
maxscale-system-test/cnf/maxscale.cnf.template.mxs361
View File

@ -16,7 +16,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service
@ -70,7 +70,7 @@ router= readwritesplit
servers=gserver1,gserver2,gserver3,gserver4 servers=gserver1,gserver2,gserver3,gserver4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[RW Split Listener Galera] [RW Split Listener Galera]
type=listener type=listener

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs501
View File

@ -16,7 +16,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
filters=duplicate filters=duplicate

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs548
View File

@ -16,7 +16,7 @@ router= readwritesplit
servers=server1, server2 servers=server1, server2
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs559
View File

@ -18,7 +18,7 @@ router= readwritesplit
servers=server1, server2 servers=server1, server2
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs710_bad_socket
View File

@ -17,7 +17,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs711_two_ports
View File

@ -17,7 +17,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs720_line_with_no_equal
View File

@ -16,7 +16,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
line_no_equal line_no_equal

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs720_wierd_line
View File

@ -16,7 +16,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs722
View File

@ -16,7 +16,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
filters=QLA filters=QLA

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout
View File

@ -16,7 +16,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
connection_keepalive=5 connection_keepalive=5

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs874
View File

@ -14,7 +14,7 @@ detect_stale_master=false
type=service type=service
router=readwritesplit router=readwritesplit
servers=server1,server2,server3 servers=server1,server2,server3
router_options=disable_sescmd_history=false disable_sescmd_history=false
user=maxskysql user=maxskysql
password=skysql password=skysql
max_slave_connections=1 max_slave_connections=1

3
maxscale-system-test/cnf/maxscale.cnf.template.no_ses_cmd_store
View File

@ -16,7 +16,8 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql 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 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.open_close
View File

@ -16,7 +16,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

4
maxscale-system-test/cnf/maxscale.cnf.template.pers_01
View File

@ -16,7 +16,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service
@ -70,7 +70,7 @@ router= readwritesplit
servers=gserver1,gserver2,gserver3,gserver4 servers=gserver1,gserver2,gserver3,gserver4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[RW Split Listener Galera] [RW Split Listener Galera]
type=listener type=listener

2
maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc
View File

@ -16,7 +16,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.replication
View File

@ -17,7 +17,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539
View File

@ -12,7 +12,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
max_slave_connections=100% max_slave_connections=100%
use_sql_variables_in=master use_sql_variables_in=master
router_options=slave_selection_criteria=LEAST_BEHIND_MASTER slave_selection_criteria=LEAST_BEHIND_MASTER
user=maxskysql user=maxskysql
password=skysql password=skysql
filters=hints filters=hints

2
maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave
View File

@ -16,7 +16,7 @@ max_slave_connections=1
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=disable_sescmd_history=false disable_sescmd_history=false
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt
View File

@ -17,7 +17,7 @@ router=readwritesplit
servers=server1,server2 servers=server1,server2
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=strict_multi_stmt=true strict_multi_stmt=true
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

6
maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly
View File

@ -15,7 +15,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=master_failure_mode=fail_instantly master_failure_mode=fail_instantly
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service
@ -23,7 +23,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=master_failure_mode=error_on_write master_failure_mode=error_on_write
[Read Connection Router Master] [Read Connection Router Master]
type=service type=service
@ -31,7 +31,7 @@ router=readwritesplit
servers=server1,server2,server3,server4 servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=master_failure_mode=fail_on_write master_failure_mode=fail_on_write
[RW Split Listener] [RW Split Listener]
type=listener type=listener

4
maxscale-system-test/cnf/maxscale.cnf.template.script
View File

@ -30,7 +30,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[RW Split Router Galera] [RW Split Router Galera]
type=service type=service
@ -38,7 +38,7 @@ router= readwritesplit
servers=gserver1,gserver2,gserver3,gserver4 servers=gserver1,gserver2,gserver3,gserver4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

4
maxscale-system-test/cnf/maxscale.cnf.template.session_limits
View File

@ -16,7 +16,9 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql 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] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.show_monitor_crash
View File

@ -17,7 +17,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest
View File

@ -16,7 +16,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
version_string=5.5.5-10.0.0-mxs version_string=5.5.5-10.0.0-mxs

2
maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers1
View File

@ -16,7 +16,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers10
View File

@ -16,7 +16,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
[Read Connection Router Slave] [Read Connection Router Slave]

2
maxscale-system-test/cnf/maxscale.cnf.template.ssl
View File

@ -15,7 +15,7 @@ router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.ssl_load
View File

@ -16,7 +16,7 @@ servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS slave_selection_criteria=LEAST_CURRENT_OPERATIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera
View File

@ -17,7 +17,7 @@ servers=server1,server2,server3,server4
user=maxskysql user=maxskysql
password=skysql password=skysql
max_slave_connections=100% max_slave_connections=100%
router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS slave_selection_criteria=LEAST_CURRENT_OPERATIONS
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service