diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.add_server b/maxscale-system-test/cnf/maxscale.cnf.template.add_server index 32665eba8..f2d9f694c 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.add_server +++ b/maxscale-system-test/cnf/maxscale.cnf.template.add_server @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1,server2,server3,server4 @@ -13,13 +13,13 @@ password= skysql type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled socket=default -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -27,9 +27,9 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.add_service b/maxscale-system-test/cnf/maxscale.cnf.template.add_service index 9bb52ba46..ebd65394c 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.add_service +++ b/maxscale-system-test/cnf/maxscale.cnf.template.add_service @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1,server2,server3,server4 @@ -13,13 +13,13 @@ password= skysql type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled socket=default -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -27,13 +27,13 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -41,9 +41,9 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.auroramon b/maxscale-system-test/cnf/maxscale.cnf.template.auroramon index 9a9695f04..b63d7c6b9 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.auroramon +++ b/maxscale-system-test/cnf/maxscale.cnf.template.auroramon @@ -4,7 +4,7 @@ log_warning=1 # Monitors -[Aurora Monitor] +[Aurora-Monitor] type=monitor module=auroramon servers=server1,server2,server3,server4 @@ -14,7 +14,7 @@ monitor_interval=1000 # Services -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -27,15 +27,15 @@ router=cli # Listeners -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled socket=default -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.avro b/maxscale-system-test/cnf/maxscale.cnf.template.avro index 98ea0c8f0..7a0c574c0 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.avro +++ b/maxscale-system-test/cnf/maxscale.cnf.template.avro @@ -10,7 +10,7 @@ password=skysql version_string=5.6.15-log router_options=server_id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -20,7 +20,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.avro_compression b/maxscale-system-test/cnf/maxscale.cnf.template.avro_compression index bb63860ce..9eadf112f 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.avro_compression +++ b/maxscale-system-test/cnf/maxscale.cnf.template.avro_compression @@ -10,7 +10,7 @@ password=skysql version_string=5.6.15-log router_options=server_id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -20,7 +20,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bad_pers b/maxscale-system-test/cnf/maxscale.cnf.template.bad_pers index c9a255459..6e55dcf5d 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bad_pers +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bad_pers @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -19,7 +19,7 @@ password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,22 +35,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl b/maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl index 4708dab50..59fea472a 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -24,7 +24,7 @@ ssl_ca_cert=/###access_homedir###/certs/ca.pem ssl_version=TLSv12 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -37,7 +37,7 @@ ssl_key=/###access_homedir###/certs/server-key.pem ssl_ca_cert=/###access_homedir###/certs/ca.pem ssl_version=TLSv12 -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -50,22 +50,22 @@ ssl_key=/###access_homedir###/certs/server-key.pem ssl_ca_cert=/###access_homedir###/certs/ca.pem ssl_version=TLSv12 -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -73,7 +73,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.batchinsert b/maxscale-system-test/cnf/maxscale.cnf.template.batchinsert index aa783cceb..ab4ba2195 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.batchinsert +++ b/maxscale-system-test/cnf/maxscale.cnf.template.batchinsert @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -9,7 +9,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -18,7 +18,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -26,7 +26,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -34,21 +34,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -56,7 +56,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_cbc b/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_cbc index 33f4b09bd..a4cb55767 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_cbc +++ b/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_cbc @@ -9,7 +9,7 @@ password=skysql version_string=5.6.15-log router_options=server_id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1,encrypt_binlog=1,encryption_key_file=/etc/mariadb_binlog_keys.txt,encryption_algorithm=aes_cbc -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -19,7 +19,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_ctr b/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_ctr index 9370cc261..fc19b1755 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_ctr +++ b/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_ctr @@ -9,7 +9,7 @@ password=skysql version_string=5.6.15-log router_options=server_id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1,encrypt_binlog=1,encryption_key_file=/etc/mariadb_binlog_keys.txt,encryption_algorithm=aes_ctr -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -19,7 +19,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_incompl b/maxscale-system-test/cnf/maxscale.cnf.template.binlog_incompl index ffe051635..0976092ed 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_incompl +++ b/maxscale-system-test/cnf/maxscale.cnf.template.binlog_incompl @@ -13,7 +13,7 @@ version_string=5.6.15-log # -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -23,7 +23,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug359 b/maxscale-system-test/cnf/maxscale.cnf.template.bug359 index 6cb3b569d..76d757441 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug359 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug359 @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit router_options=slave @@ -17,7 +17,7 @@ servers=server1, server2, server3,server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -25,7 +25,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -33,22 +33,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug471 b/maxscale-system-test/cnf/maxscale.cnf.template.bug471 index db4050adf..706c06efa 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug471 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug471 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1,server3 ,server4 @@ -19,7 +19,7 @@ module=regexfilter match=fetch replace=select -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -31,7 +31,7 @@ slave_selection_criteria=LEAST_BEHIND_MASTER filters=hints|regex -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -39,7 +39,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -47,22 +47,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -70,7 +70,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug479 b/maxscale-system-test/cnf/maxscale.cnf.template.bug479 index 1e90ab770..07bcd578a 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug479 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug479 @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -17,7 +17,7 @@ user=maxskysql password=skysql filters=non existing filter | не существуюший фильтер -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -25,7 +25,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -33,22 +33,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug493 b/maxscale-system-test/cnf/maxscale.cnf.template.bug493 index 5e59e6de6..b97dae29b 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug493 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug493 @@ -2,21 +2,21 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -24,7 +24,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -32,22 +32,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug495 b/maxscale-system-test/cnf/maxscale.cnf.template.bug495 index 308ae3159..bec950726 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug495 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug495 @@ -2,21 +2,21 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4,server5 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -24,7 +24,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -32,22 +32,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug526 b/maxscale-system-test/cnf/maxscale.cnf.template.bug526 index 55174315b..384800aef 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug526 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug526 @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -17,7 +17,7 @@ user=maxskysql password=skysql filters=testfilter -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -25,7 +25,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -33,22 +33,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -56,7 +56,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug539 b/maxscale-system-test/cnf/maxscale.cnf.template.bug539 index 0bd6cb246..bef63906c 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug539 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug539 @@ -2,7 +2,7 @@ threads=8 log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon detect_replication_lag=1 @@ -15,7 +15,7 @@ type=filter module=hintfilter -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -26,7 +26,7 @@ user=maxskysql password=skysql filters=hints -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -34,7 +34,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -42,22 +42,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -65,7 +65,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug547 b/maxscale-system-test/cnf/maxscale.cnf.template.bug547 index 4cfdccedb..70fc162b7 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug547 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug547 @@ -2,21 +2,21 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -24,7 +24,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -32,22 +32,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -55,7 +55,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug567 b/maxscale-system-test/cnf/maxscale.cnf.template.bug567 index 59beee7bc..07ddbc441 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug567 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug567 @@ -4,7 +4,7 @@ log_warning=1 log_to_shm=1 log_debug=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -13,7 +13,7 @@ password= skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -22,7 +22,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -30,7 +30,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -38,22 +38,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -61,7 +61,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug571 b/maxscale-system-test/cnf/maxscale.cnf.template.bug571 index 23f317efb..79fd85328 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug571 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug571 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -25,7 +25,7 @@ replace=select type=filter module=hintfilter -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -37,7 +37,7 @@ slave_selection_criteria=LEAST_BEHIND_MASTER filters=hints|regex|r2 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -45,7 +45,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -53,22 +53,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -76,7 +76,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug585 b/maxscale-system-test/cnf/maxscale.cnf.template.bug585 index a4c3c8d01..643acf28a 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug585 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug585 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -21,7 +21,7 @@ module=regexfilter match=[Ff][Oo0][Rr][Mm] replace=from -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -36,7 +36,7 @@ filters=regex|typo|hints type=filter module=hintfilter -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -44,7 +44,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -52,22 +52,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -75,7 +75,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug587 b/maxscale-system-test/cnf/maxscale.cnf.template.bug587 index 3dee6d5b6..e8e76382b 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug587 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug587 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -19,7 +19,7 @@ module=regexfilter match=fetch replace=select -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -30,7 +30,7 @@ use_sql_variables_in=all slave_selection_criteria=LEAST_BEHIND_MASTER filters=hints|regex -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -38,7 +38,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -46,22 +46,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -69,7 +69,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 b/maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 index 5857707ad..89d38ecd9 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -19,7 +19,7 @@ module=regexfilter match=fetch replace=select -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -30,7 +30,7 @@ use_sql_variables_in=all slave_selection_criteria=LEAST_BEHIND_MASTER filters=regex|hints -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -38,7 +38,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -46,22 +46,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -69,7 +69,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug601 b/maxscale-system-test/cnf/maxscale.cnf.template.bug601 index 893d19603..0cdd0608b 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug601 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug601 @@ -2,21 +2,21 @@ threads=1 log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -24,7 +24,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -32,22 +32,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -55,7 +55,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug620 b/maxscale-system-test/cnf/maxscale.cnf.template.bug620 index f08bf34ef..5db311309 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug620 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug620 @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -17,7 +17,7 @@ user=maxskysql password=skysql enable_root_user=true -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -25,7 +25,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -33,22 +33,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -56,7 +56,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug643 b/maxscale-system-test/cnf/maxscale.cnf.template.bug643 index d32bdb58b..2ad083c64 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug643 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug643 @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -22,10 +22,10 @@ filters=duplicate [duplicate] type=filter module=tee -service=RW Split Router +service=RW-Split-Router -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -33,7 +33,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -41,22 +41,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -64,7 +64,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug643_1 b/maxscale-system-test/cnf/maxscale.cnf.template.bug643_1 index fd764170e..ae71ae484 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug643_1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug643_1 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon monitor_interval=10000 @@ -37,13 +37,13 @@ filebase=/tmp/QueryLog [duplicate] type=filter module=tee -service=RW Split2 +service=RW-Split2 [testfilter] type=filter module=foobar -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -57,7 +57,7 @@ password=skysql #enable_root_user=1 filters=duplicate -[RW Split2] +[RW-Split2] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -68,7 +68,7 @@ password=skysql filters=qla|tests|hints -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -76,7 +76,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -84,22 +84,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -107,7 +107,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug645 b/maxscale-system-test/cnf/maxscale.cnf.template.bug645 index d6d62bac7..36a75d291 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug645 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug645 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -42,7 +42,7 @@ service=RW_Split protocol=MySQLClient port=4016 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -50,7 +50,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -58,15 +58,15 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -74,7 +74,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug645_1 b/maxscale-system-test/cnf/maxscale.cnf.template.bug645_1 index 693535849..2dbde4185 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug645_1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug645_1 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -42,7 +42,7 @@ service=RW_Split protocol=MySQLClient port=4016 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -50,7 +50,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -58,15 +58,15 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -74,7 +74,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug648 b/maxscale-system-test/cnf/maxscale.cnf.template.bug648 index 258b0df88..b5bb6f1e7 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug648 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug648 @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -20,9 +20,9 @@ password=skysql [TEE] type=filter module=tee -service=RW Split Router +service=RW-Split-Router -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -31,7 +31,7 @@ user=maxskysql password=skysql filters=TEE -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -40,22 +40,22 @@ user=maxskysql password=skysql filters=TEE -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -63,7 +63,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug650 b/maxscale-system-test/cnf/maxscale.cnf.template.bug650 index 2fe12f6b4..762e86006 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug650 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug650 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -42,7 +42,7 @@ service=RW_Split protocol=MySQLClient port=4016 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -50,7 +50,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -58,15 +58,15 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -75,7 +75,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug657 b/maxscale-system-test/cnf/maxscale.cnf.template.bug657 index b409054d8..be13f8e50 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug657 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug657 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -10,14 +10,14 @@ user=maxskysql password= skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -26,7 +26,7 @@ user=maxskysql password=skysql filters=TEE -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -38,24 +38,24 @@ filters=TEE [TEE] type=filter module=tee -service=RW Split Router +service=RW-Split-Router -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -63,7 +63,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug662 b/maxscale-system-test/cnf/maxscale.cnf.template.bug662 index 3909f875f..7813f69e1 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug662 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug662 @@ -4,7 +4,7 @@ auth_connect_timeout=1 auth_read_timeout=1 auth_write_timeout=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -16,7 +16,7 @@ backend_connect_timeout=1 backend_read_timeout=1 backend_write_timeout=1 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -25,7 +25,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -33,7 +33,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -41,21 +41,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -63,7 +63,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug664 b/maxscale-system-test/cnf/maxscale.cnf.template.bug664 index df627b191..b60cef443 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug664 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug664 @@ -2,7 +2,7 @@ threads=###threads### log_info=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -42,7 +42,7 @@ service=RW_Split protocol=MySQLClient port=4016 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -50,7 +50,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -58,15 +58,15 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -74,7 +74,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug670 b/maxscale-system-test/cnf/maxscale.cnf.template.bug670 index fd275d0dc..14790d9c0 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug670 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug670 @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon monitor_interval=10000 @@ -33,9 +33,9 @@ filebase=/tmp/QueryLog [duplicate] type=filter module=tee -service=RW Split2 +service=RW-Split2 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -48,7 +48,7 @@ password=skysql filters=typo|qla|regex|hints|regex|hints enable_root_user=1 -[RW Split2] +[RW-Split2] type=service router=readwritesplit servers=server1,server2 @@ -57,7 +57,7 @@ use_sql_variables_in=all user=skysql password=skysql -[Read Connection Router] +[Read-Connection-Router] type=service router=readconnroute router_options=master @@ -70,31 +70,31 @@ filters=duplicate type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled socket=default -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[RW Split Listener2] +[RW-Split-Listener2] type=listener -service=RW Split2 +service=RW-Split2 protocol=MySQLClient port=4012 -[Read Connection Listener] +[Read-Connection-Listener] type=listener -service=Read Connection Router +service=Read-Connection-Router protocol=MySQLClient port=4008 -[Read Connection Router Slave] +[Read-Connection-Router Slave] type=service router=readconnroute router_options= slave @@ -102,9 +102,9 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Listener Slave] +[Read-Connection-Listener Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router Slave protocol=MySQLClient port=4009 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug673 b/maxscale-system-test/cnf/maxscale.cnf.template.bug673 index 408cda1a7..a308048e2 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug673 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug673 @@ -2,7 +2,7 @@ threads=###threads### auth_connect_timeout=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1 @@ -11,16 +11,16 @@ password=skysql monitor_interval=1000 backend_connect_timeout=1 -[RW Split Router] +[RW-Split-Router] type=service router=readconnroute servers=server1 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -28,7 +28,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug681 b/maxscale-system-test/cnf/maxscale.cnf.template.bug681 index 46e388a16..55ad0032b 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug681 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug681 @@ -1,14 +1,14 @@ [maxscale] threads=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mariadbmon servers=server1,server2,server3 user=maxskysql password=skysql -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3 @@ -19,7 +19,7 @@ version_string=MariaDBEC-10.0.14 localhost_match_wildcard_host=1 max_slave_connections=10% -[Read Connection Router] +[Read-Connection-Router] type=service router=readconnroute router_options=master @@ -27,13 +27,13 @@ servers=server1,server2,server3 user=maxskysql password=skysql -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router Slave protocol=MySQLClient port=4009 -[Read Connection Router Slave] +[Read-Connection-Router Slave] type=service router=readconnroute router_options=slave @@ -41,15 +41,15 @@ servers=server1,server2,server3 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener] +[Read-Connection-Listener] type=listener -service=Read Connection Router +service=Read-Connection-Router protocol=MySQLClient port=4008 @@ -57,7 +57,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug705 b/maxscale-system-test/cnf/maxscale.cnf.template.bug705 index ae6a7c15b..404b556e1 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug705 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug705 @@ -2,21 +2,21 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -24,7 +24,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -32,22 +32,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -55,7 +55,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug718 b/maxscale-system-test/cnf/maxscale.cnf.template.bug718 index 488fa1b88..7f209774a 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug718 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug718 @@ -2,14 +2,14 @@ threads=1 log_warning=1 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -17,7 +17,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -26,35 +26,35 @@ user=maxskysql password=skysql -[RW Split Router Galera] +[RW-Split-Router Galera] type=service router= readwritesplit servers=g_server1, g_server2, g_server3, g_server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 -[RW Split Listener Galera] +[RW-Split-Listener Galera] type=listener -service=RW Split Router Galera +service=RW-Split-Router Galera protocol=MySQLClient port=4016 @@ -62,7 +62,7 @@ port=4016 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug730 b/maxscale-system-test/cnf/maxscale.cnf.template.bug730 index 0a51b2228..df7b6ddd3 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug730 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug730 @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -25,7 +25,7 @@ options=ignorecase match=SET OPTION SQL_QUOTE_SHOW_CREATE replace=SET SQL_QUOTE_SHOW_CREATE -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -34,7 +34,7 @@ user=maxskysql password=skysql filters=MySetOptionFilter -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -43,22 +43,22 @@ user=maxskysql password=skysql filters=MySetOptionFilter -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -66,7 +66,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bulk_insert b/maxscale-system-test/cnf/maxscale.cnf.template.bulk_insert index 243d2cbda..776b433ff 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bulk_insert +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bulk_insert @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1 @@ -9,14 +9,14 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -24,7 +24,7 @@ servers=server1 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -32,21 +32,21 @@ servers=server1 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -54,7 +54,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.cache_basic b/maxscale-system-test/cnf/maxscale.cnf.template.cache_basic index 6bb12ecd9..1544443d5 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.cache_basic +++ b/maxscale-system-test/cnf/maxscale.cnf.template.cache_basic @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2 @@ -11,7 +11,7 @@ password= skysql monitor_interval=1000 detect_stale_master=false -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -19,7 +19,7 @@ servers=server1,server2 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -28,15 +28,15 @@ user=maxskysql password=skysql filters=Cache -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -44,7 +44,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter b/maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter index fc52ead89..44d7e8254 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter +++ b/maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -22,7 +22,7 @@ time=10 # RWSplit -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -32,15 +32,15 @@ slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 filters=ccrfilter -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 # RConn - Slave -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -48,15 +48,15 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 # RConn - Master -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -64,9 +64,9 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -76,7 +76,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend b/maxscale-system-test/cnf/maxscale.cnf.template.check_backend index b83a8b23e..aa230bae4 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend +++ b/maxscale-system-test/cnf/maxscale.cnf.template.check_backend @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=1000 -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=gserver1,gserver2,gserver3,gserver4 @@ -19,7 +19,7 @@ password=skysql monitor_interval=1000 root_node_as_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -27,7 +27,7 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[RW Split Router Galera] +[RW-Split-Router Galera] type=service router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 @@ -35,7 +35,7 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -43,7 +43,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -51,30 +51,30 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[RW Split Listener Galera] +[RW-Split-Listener Galera] type=listener -service=RW Split Router Galera +service=RW-Split-Router Galera protocol=MySQLClient port=4016 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -82,7 +82,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.config_reload b/maxscale-system-test/cnf/maxscale.cnf.template.config_reload index d3e86e85a..735167224 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.config_reload +++ b/maxscale-system-test/cnf/maxscale.cnf.template.config_reload @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -13,13 +13,13 @@ password= skysql type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled socket=default -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -27,9 +27,9 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.connection_limit b/maxscale-system-test/cnf/maxscale.cnf.template.connection_limit index 1cc5ccbc5..b07d59185 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.connection_limit +++ b/maxscale-system-test/cnf/maxscale.cnf.template.connection_limit @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -12,7 +12,7 @@ monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -22,7 +22,7 @@ slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 max_connections=10 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -31,7 +31,7 @@ user=maxskysql password=skysql max_connections=25 -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -40,22 +40,22 @@ user=maxskysql password=skysql max_connections=20 -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -63,7 +63,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf b/maxscale-system-test/cnf/maxscale.cnf.template.fwf index 7153f8b7f..6e9fba9b3 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.fwf +++ b/maxscale-system-test/cnf/maxscale.cnf.template.fwf @@ -2,7 +2,7 @@ threads=###threads### query_classifier_args=log_unrecognized_statements=3 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1 @@ -10,22 +10,22 @@ user=maxskysql password=skysql monitor_interval=100 -[Database Firewall] +[Database-Firewall] type=filter module=dbfwfilter rules=/###access_homedir###/rules/rules.txt log_match=true log_no_match=true -[RW Split Router] +[RW-Split-Router] type=service router=readconnroute servers=server1 user=maxskysql password=skysql -filters=Database Firewall +filters=Database-Firewall -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -33,7 +33,7 @@ servers=server1 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -41,21 +41,21 @@ servers=server1 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -63,7 +63,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_action b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_action index 152b5de9b..62de6fbe2 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_action +++ b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_action @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_com_ping b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_com_ping index c372162b7..d9a7aee1e 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_com_ping +++ b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_com_ping @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_logging b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_logging index 64a26471f..4e88b2814 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_logging +++ b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_logging @@ -7,7 +7,7 @@ address=###node_server_IP_1### port=###node_server_port_1### protocol=MySQLBackend -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_syntax b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_syntax index da495fdfa..097d96650 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_syntax +++ b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_syntax @@ -2,17 +2,17 @@ threads=###threads### log_warning=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute servers=server1 user=maxskysql password=skysql -filters=Database Firewall +filters=Database-Firewall -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 @@ -22,7 +22,7 @@ address=###node_server_IP_1### port=###node_server_port_1### protocol=MySQLBackend -[Database Firewall] +[Database-Firewall] type=filter module=dbfwfilter rules=/###access_homedir###/rules/rules.txt diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera b/maxscale-system-test/cnf/maxscale.cnf.template.galera index 63d4ad10b..9ddc808ac 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=server1,server2,server3,server4 @@ -10,7 +10,7 @@ password=skysql monitor_interval=1000 root_node_as_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -19,7 +19,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -27,7 +27,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,21 +35,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -57,7 +57,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut b/maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut index ab780aa33..f1023d231 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut @@ -2,7 +2,7 @@ threads=###threads### log_info=1 -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=server1,server2,server3,server4 @@ -11,7 +11,7 @@ password=skysql monitor_interval=1000 root_node_as_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -20,7 +20,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -36,21 +36,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564 b/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564 index c8e52d034..6450c7a6f 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=server1,server2,server3,server4 @@ -10,14 +10,14 @@ user=maxskysql password=skysql root_node_as_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -25,7 +25,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -33,22 +33,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -80,7 +80,7 @@ protocol=MySQLBackend type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority b/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority index b43addfcd..195454982 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority @@ -4,7 +4,7 @@ log_warning=1 log_info=1 log_notice=1 -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=server1,server2,server3,server4 @@ -14,16 +14,16 @@ use_priority=true monitor_interval=1000 root_node_as_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -59,7 +59,7 @@ priority=3 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper b/maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper index b4a8cce47..8024555d6 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper +++ b/maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper @@ -4,7 +4,7 @@ log_warning=1 # Monitors -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -15,7 +15,7 @@ detect_stale_master=false # Services -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -39,16 +39,16 @@ mode=learn # Listeners -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled #address=localhost socket=default -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 socket=/tmp/rwsplit.sock diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.hartmut b/maxscale-system-test/cnf/maxscale.cnf.template.hartmut index 3980870ea..1c4da312f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.hartmut +++ b/maxscale-system-test/cnf/maxscale.cnf.template.hartmut @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -11,7 +11,7 @@ password= skysql monitor_interval=500 detect_replication_lag=1 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -20,7 +20,7 @@ password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_replication_lag=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -36,22 +36,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -59,7 +59,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.hints b/maxscale-system-test/cnf/maxscale.cnf.template.hints index 4b30346c4..93f71a0e2 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.hints +++ b/maxscale-system-test/cnf/maxscale.cnf.template.hints @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -13,7 +13,7 @@ password= skysql type=filter module=hintfilter -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -25,7 +25,7 @@ slave_selection_criteria=LEAST_BEHIND_MASTER filters=hints -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -33,7 +33,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -41,22 +41,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -64,7 +64,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.hints2 b/maxscale-system-test/cnf/maxscale.cnf.template.hints2 index d962b8502..c31e466db 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.hints2 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.hints2 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1,server2,server3,server4 @@ -13,7 +13,7 @@ password= skysql type=filter module=hintfilter -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -24,7 +24,7 @@ use_sql_variables_in=all slave_selection_criteria=LEAST_BEHIND_MASTER filters=hints -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -32,7 +32,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -40,21 +40,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -62,7 +62,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.insertstream b/maxscale-system-test/cnf/maxscale.cnf.template.insertstream index bd178a470..6afbcdb9d 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.insertstream +++ b/maxscale-system-test/cnf/maxscale.cnf.template.insertstream @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1 @@ -13,7 +13,7 @@ monitor_interval=1000 type=filter module=insertstream -[RW Split Router] +[RW-Split-Router] type=service router=readconnroute servers=server1 @@ -21,9 +21,9 @@ user=maxskysql password=skysql filters=insertstream -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -31,7 +31,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt b/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt index 40c5fec7b..ff65e788a 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt +++ b/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[galera Monitor] +[galera-Monitor] type=monitor module=galeramon servers= server1, server2,server3 ,server4 @@ -11,7 +11,7 @@ password= skysql monitor_interval=1000 root_node_as_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -19,7 +19,7 @@ user=maxskysql password=skysql version_string=5.5.5-10.0.0-mxs -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -28,7 +28,7 @@ user=maxskysql password=skysql version_string=5.5.5-10.0.0-mxs -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -37,21 +37,21 @@ user=maxskysql password=skysql version_string=5.5.5-10.0.0-mxs -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -59,7 +59,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 index 89b31ceae..e9c6cadd6 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -11,7 +11,7 @@ monitor_interval=1000 detect_stale_master=false detect_standalone_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -21,7 +21,7 @@ slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=10.2-server1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -30,7 +30,7 @@ user=maxskysql password=skysql version_string=10.2-server1 -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -39,21 +39,21 @@ user=maxskysql password=skysql version_string=10.2-server1 -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -61,7 +61,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 index b0848e22b..f7dd2ee0f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -11,7 +11,7 @@ monitor_interval=1000 detect_stale_master=false detect_standalone_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -21,7 +21,7 @@ slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=10.2-server2 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -30,7 +30,7 @@ user=maxskysql password=skysql version_string=10.2-server2 -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -39,21 +39,21 @@ user=maxskysql password=skysql version_string=10.2-server2 -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -61,7 +61,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 2b937f63d..e52665b35 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mariadbmon servers=server1,server2,server3,server4 @@ -13,7 +13,7 @@ detect_standalone_master=false auto_failover=true failcount=1 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -23,7 +23,7 @@ slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=10.2-server1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -32,7 +32,7 @@ user=maxskysql password=skysql version_string=10.2-server1 -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -41,21 +41,21 @@ user=maxskysql password=skysql version_string=10.2-server1 -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -63,7 +63,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 b0ed8ba3b..bdbd17d20 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mariadbmon servers=server1,server2,server3,server4 @@ -13,7 +13,7 @@ detect_standalone_master=false auto_failover=true failcount=1 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -23,7 +23,7 @@ slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=10.2-server2 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -32,7 +32,7 @@ user=maxskysql password=skysql version_string=10.2-server2 -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -41,21 +41,21 @@ user=maxskysql password=skysql version_string=10.2-server2 -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -63,7 +63,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.kerberos b/maxscale-system-test/cnf/maxscale.cnf.template.kerberos index aa201fadd..2a920ba17 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.kerberos +++ b/maxscale-system-test/cnf/maxscale.cnf.template.kerberos @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -11,7 +11,7 @@ password= skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -20,7 +20,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -36,9 +36,9 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock @@ -46,18 +46,18 @@ authenticator=GSSAPIAuth authenticator_options=principal_name=mariadb/maxscale.test@MAXSCALE.TEST -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 authenticator=GSSAPIAuth authenticator_options=principal_name=mariadb/maxscale.test@MAXSCALE.TEST -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 authenticator=GSSAPIAuth @@ -68,7 +68,7 @@ authenticator_options=principal_name=mariadb/maxscale.test@MAXSCALE.TEST type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.lag b/maxscale-system-test/cnf/maxscale.cnf.template.lag index eb74e5aaa..9c68b9c38 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.lag +++ b/maxscale-system-test/cnf/maxscale.cnf.template.lag @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -18,7 +18,7 @@ backend_write_timeout=10 type=filter module=hintfilter -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -31,7 +31,7 @@ max_slave_replication_lag=20 filters=hints -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -39,7 +39,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -47,22 +47,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -70,7 +70,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load b/maxscale-system-test/cnf/maxscale.cnf.template.load index a28b749f6..ea5c3188c 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -18,7 +18,7 @@ password=skysql max_slave_connections=100% slave_selection_criteria=LEAST_CURRENT_OPERATIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -26,7 +26,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -34,22 +34,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -57,7 +57,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera index 37d921b02..575c27c3f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=server1,server2,server3,server4 @@ -10,7 +10,7 @@ user=maxskysql password=skysql root_node_as_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -19,7 +19,7 @@ password=skysql max_slave_connections=100% slave_selection_criteria=LEAST_CURRENT_OPERATIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,22 +35,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 8155a62fc..57744ef24 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=server1,server2,server3,server4 @@ -10,7 +10,7 @@ user=maxskysql password=skysql root_node_as_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -19,7 +19,7 @@ password=skysql max_slave_connections=100% slave_selection_criteria=LEAST_CURRENT_OPERATIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,22 +35,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 7c7b3b442..13b78bc1e 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=server1,server2,server3,server4 @@ -10,7 +10,7 @@ user=maxskysql password=skysql root_node_as_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -19,7 +19,7 @@ password=skysql max_slave_connections=100% slave_selection_criteria=LEAST_CURRENT_OPERATIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,22 +35,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 b/maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 index ce5f67cfa..d43862d8d 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -18,7 +18,7 @@ password=skysql max_slave_connections=100% slave_selection_criteria=LEAST_CURRENT_OPERATIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -26,7 +26,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -34,22 +34,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -57,7 +57,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 b/maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 index cac575372..b6deb03e5 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -18,7 +18,7 @@ password=skysql max_slave_connections=100% slave_selection_criteria=LEAST_CURRENT_OPERATIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -26,7 +26,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -34,22 +34,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -57,7 +57,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.local_address b/maxscale-system-test/cnf/maxscale.cnf.template.local_address index 38309b0ee..5bb11a594 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.local_address +++ b/maxscale-system-test/cnf/maxscale.cnf.template.local_address @@ -2,7 +2,7 @@ threads=###threads### ###local_address### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -11,7 +11,7 @@ password=skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -20,7 +20,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -36,21 +36,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.longblob b/maxscale-system-test/cnf/maxscale.cnf.template.longblob index 5c87f2e41..dc83d54ad 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.longblob +++ b/maxscale-system-test/cnf/maxscale.cnf.template.longblob @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -12,7 +12,7 @@ monitor_interval=1000 backend_connect_timeout=10 backend_read_timeout=10 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -21,7 +21,7 @@ password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -29,7 +29,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -37,22 +37,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -60,7 +60,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters b/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters index 776e8f68a..ad4f7e633 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters +++ b/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters @@ -2,7 +2,7 @@ threads=###threads### log_info=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -12,7 +12,7 @@ monitor_interval=1000 backend_connect_timeout=10 backend_read_timeout=10 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -20,12 +20,12 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS 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=hints|regex|ccrfilter|MaxRows|Masking|Cache|namedserverfilter|Database Firewall +#filters=hints|regex|ccrfilter|MaxRows|Masking|Cache|namedserverfilter|Database-Firewall -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -33,7 +33,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -41,22 +41,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -64,7 +64,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled @@ -98,7 +98,7 @@ protocol=MySQLBackend [duplicate] type=filter module=tee -service=RW Split Router Galera +service=RW-Split-Router Galera [hints] type=filter @@ -148,14 +148,14 @@ module=namedserverfilter match=SELECT server=server2 -[Database Firewall] +[Database-Firewall] type=filter module=dbfwfilter rules=/###access_homedir###/rules/rules.txt log_match=true log_no_match=true -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=gserver1,gserver2,gserver3,gserver4 @@ -164,7 +164,7 @@ password=skysql monitor_interval=100 root_node_as_master=false -[RW Split Router Galera] +[RW-Split-Router Galera] type=service router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 @@ -172,9 +172,9 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[RW Split Listener Galera] +[RW-Split-Listener Galera] type=listener -service=RW Split Router Galera +service=RW-Split-Router Galera protocol=MySQLClient port=4016 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest b/maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest index 132f04be1..dd4893e4d 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest +++ b/maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -11,7 +11,7 @@ password= skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -20,7 +20,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -37,22 +37,22 @@ user=maxskysql password=skysql filters=Masking -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -60,7 +60,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.master_only b/maxscale-system-test/cnf/maxscale.cnf.template.master_only index 3598d19f9..d4b7e1c99 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.master_only +++ b/maxscale-system-test/cnf/maxscale.cnf.template.master_only @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1 @@ -19,7 +19,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,22 +35,22 @@ servers=server1 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxctrl b/maxscale-system-test/cnf/maxscale.cnf.template.maxctrl index a696b996c..59af43366 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.maxctrl +++ b/maxscale-system-test/cnf/maxscale.cnf.template.maxctrl @@ -4,7 +4,7 @@ admin_auth=false log_info=1 admin_host=:: -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -12,7 +12,7 @@ user=maxskysql password=skysql monitor_interval=10000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -20,7 +20,7 @@ user=maxskysql password=skysql max_slave_connections=100% -[SchemaRouter Router] +[SchemaRouter-Router] type=service router=schemarouter servers=server1,server2,server3,server4 @@ -28,7 +28,7 @@ user=maxskysql password=skysql auth_all_servers=1 -[RW Split Hint Router] +[RW-Split-Hint-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -37,7 +37,7 @@ password=skysql max_slave_connections=100% filters=Hint -[Read Connection Router] +[Read-Connection-Router] type=service router=readconnroute router_options=master @@ -53,17 +53,17 @@ module=hintfilter [recurse3] type=filter module=tee -service=RW Split Router +service=RW-Split-Router [recurse2] type=filter module=tee -service=Read Connection Router +service=Read-Connection-Router [recurse1] type=filter module=tee -service=RW Split Hint Router +service=RW-Split-Hint-Router [QLA] type=filter @@ -77,31 +77,31 @@ filebase=/tmp/qla.log type=service router=cli -[Read Connection Listener] +[Read-Connection-Listener] type=listener -service=Read Connection Router +service=Read-Connection-Router protocol=MySQLClient port=4008 -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[SchemaRouter Listener] +[SchemaRouter-Listener] type=listener -service=SchemaRouter Router +service=SchemaRouter-Router protocol=MySQLClient port=4010 -[RW Split Hint Listener] +[RW-Split-Hint-Listener] type=listener -service=RW Split Hint Router +service=RW-Split-Hint-Router protocol=MySQLClient port=4009 -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxctrl_basic b/maxscale-system-test/cnf/maxscale.cnf.template.maxctrl_basic index 1f2e045e2..828c3d5db 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.maxctrl_basic +++ b/maxscale-system-test/cnf/maxscale.cnf.template.maxctrl_basic @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -11,7 +11,7 @@ monitor_interval=1000 detect_stale_master=false detect_standalone_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -20,7 +20,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -37,21 +37,21 @@ user=maxskysql password=skysql filters=qla -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -64,7 +64,7 @@ filebase=/tmp/QueryLog type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo b/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo index 815fee07f..4be5c7cb8 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo +++ b/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo @@ -7,19 +7,19 @@ router=maxinfo user=maxuser password=maxpwd -[Maxinfo SQL Listener] +[Maxinfo-SQL-Listener] type=listener service=maxinfo protocol=MySQLClient port=4000 -[Maxinfo HTTP Listener] +[Maxinfo-HTTP-Listener] type=listener service=maxinfo protocol=HTTPD port=8080 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -27,7 +27,7 @@ user=maxuser password=maxpwd monitor_interval=10000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -36,7 +36,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -44,7 +44,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -52,21 +52,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -74,7 +74,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo_sql b/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo_sql index b20059e11..ee37f0c89 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo_sql +++ b/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo_sql @@ -25,7 +25,7 @@ address=###node_server_IP_4### port=###node_server_port_4### protocol=MySQLBackend -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -47,16 +47,16 @@ service=Maxinfo protocol=MySQLClient port=4008 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd b/maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd index 3094fec6d..31734bc20 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd +++ b/maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -11,7 +11,7 @@ password=skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -20,7 +20,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -36,22 +36,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -59,7 +59,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxrows b/maxscale-system-test/cnf/maxscale.cnf.template.maxrows index afb81fc13..6e3a7b540 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.maxrows +++ b/maxscale-system-test/cnf/maxscale.cnf.template.maxrows @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -11,7 +11,7 @@ password= skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -21,7 +21,7 @@ slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 filters=MaxRows -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -29,7 +29,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -37,22 +37,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -60,7 +60,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mm b/maxscale-system-test/cnf/maxscale.cnf.template.mm index 724735069..7f2bc8b1f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mm +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mm @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mmmon servers= server1, server2 @@ -11,7 +11,7 @@ password= skysql detect_stale_master=0 monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2 @@ -19,7 +19,7 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1,server2 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,22 +35,22 @@ servers=server1,server2 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 index 0b2de6058..b17d5d4cb 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1,server2,server3 ,server4 @@ -13,7 +13,7 @@ detect_stale_master=false script=/bin/sh -c "echo hello world!" events=master_down,server_down -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -22,7 +22,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -30,7 +30,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -38,22 +38,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -61,7 +61,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1113_schemarouter_ps b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1113_schemarouter_ps index 1543da66b..0bee39087 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1113_schemarouter_ps +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1113_schemarouter_ps @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Sharding router] +[Sharding-router] type=service router=schemarouter servers=server1,server2,server3,server4 @@ -18,9 +18,9 @@ password=skysql auth_all_servers=1 ignore_databases_regex=.* -[Sharding Listener] +[Sharding-Listener] type=listener -service=Sharding router +service=Sharding-router protocol=MySQLClient port=4006 @@ -28,7 +28,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1123 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1123 index 4fb2b4653..5017ec5b2 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1123 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1123 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -11,7 +11,7 @@ password=skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -19,7 +19,7 @@ user=maxskysql password=skysql connection_timeout=60 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -27,7 +27,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,21 +35,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -57,7 +57,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 index 158ddaa44..ed8b103a3 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[MySQL Monitor 1] +[MySQL-Monitor 1] type=monitor module=galeramon servers= server1, server2,server3 ,server4 @@ -17,7 +17,7 @@ user=maxskysql password= skysql root_node_as_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -25,7 +25,7 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -33,7 +33,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -41,22 +41,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -64,7 +64,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1295 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1295 index fb2fba77c..f8a0c33cc 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1295 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1295 @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2 @@ -9,7 +9,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2 @@ -18,9 +18,9 @@ password=skysql strict_multi_stmt=false strict_sp_calls=true -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -28,7 +28,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1310_implicit_db b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1310_implicit_db index 8737dd414..5cbe97b8c 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1310_implicit_db +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1310_implicit_db @@ -2,14 +2,14 @@ threads=###threads### log_info=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2 user=maxskysql password=skysql -[Sharding router] +[Sharding-router] type=service router=schemarouter servers=server1,server2 @@ -18,9 +18,9 @@ password=skysql auth_all_servers=1 ignore_databases_regex=.* -[Sharding Listener] +[Sharding-Listener] type=listener -service=Sharding router +service=Sharding-router protocol=MySQLClient port=4006 @@ -28,7 +28,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1323 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1323 index e5caa9257..54a74d1eb 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1323 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1323 @@ -4,7 +4,7 @@ log_info=1 auth_read_timeout=1 auth_connect_timeout=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1,server2 @@ -14,16 +14,16 @@ monitor_interval=1000 backend_read_timeout=1 backend_connect_timeout=1 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -31,7 +31,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth index 5e9895026..bec7a7457 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -9,14 +9,14 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -24,7 +24,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -32,23 +32,23 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 authenticator_options=skip_authentication=true -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 authenticator_options=skip_authentication=true -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 authenticator_options=skip_authentication=true @@ -57,7 +57,7 @@ authenticator_options=skip_authentication=true type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 3b53ed15f..1f0caf25d 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted @@ -2,7 +2,7 @@ threads=###threads### log_info=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -10,7 +10,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -18,9 +18,9 @@ user=maxskysql password=skysql master_failure_mode=error_on_write -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -28,7 +28,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1468 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1468 index fa32b8f19..c0e9b7deb 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1468 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1468 @@ -11,7 +11,7 @@ password=skysql type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1476 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1476 index f1ee6b83e..2e02b5420 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1476 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1476 @@ -2,7 +2,7 @@ threads=###threads### query_retries=1 -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=server1,server2 @@ -14,16 +14,16 @@ use_priority=true backend_connect_timeout=1 backend_read_timeout=1 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -31,7 +31,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_extra_slaves b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_extra_slaves index 4911016ac..81b99c3d4 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_extra_slaves +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_extra_slaves @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -9,7 +9,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -17,9 +17,9 @@ user=maxskysql password=skysql max_slave_connections=1 -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -27,7 +27,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_master_reconnection b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_master_reconnection index 4a993ca98..cf0ffe393 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_master_reconnection +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_master_reconnection @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -9,7 +9,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -18,9 +18,9 @@ password=skysql master_failure_mode=error_on_write master_reconnection=true -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -28,7 +28,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1506_delayed_retry b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1506_delayed_retry index b42557ba0..ddb7ed222 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1506_delayed_retry +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1506_delayed_retry @@ -2,7 +2,7 @@ threads=###threads### log_info=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2 @@ -12,7 +12,7 @@ monitor_interval=1000 backend_read_timeout=1 backend_connect_timeout=1 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2 @@ -23,9 +23,9 @@ master_reconnection=true delayed_retry=true delayed_retry_timeout=15 -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -33,7 +33,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_replay b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_replay index 1b193dac4..1421cf66d 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_replay +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_replay @@ -4,7 +4,7 @@ log_info=1 query_retries=5 query_retry_timeout=20 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -12,7 +12,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -21,9 +21,9 @@ password=skysql transaction_replay=true transaction_replay_max_size=200 -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -31,7 +31,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_stress b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_stress index 86e059b0f..31e6a3480 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_stress +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_stress @@ -2,7 +2,7 @@ threads=###threads### log_info=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -13,7 +13,7 @@ backend_connect_timeout=1 backend_read_timeout=1 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -22,9 +22,9 @@ password=skysql transaction_replay=true delayed_retry_timeout=30 -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -32,7 +32,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1509 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1509 index 9ff53ed90..c7364ae5f 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1509 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1509 @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2 @@ -10,16 +10,16 @@ password=skysql monitor_interval=1000 ignore_external_masters=true -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -27,7 +27,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1549_optimistic_trx b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1549_optimistic_trx index 28f25bd62..74d589f71 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1549_optimistic_trx +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1549_optimistic_trx @@ -14,7 +14,7 @@ address=###node_server_IP_2### port=###node_server_port_2### protocol=MySQLBackend -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2 @@ -22,7 +22,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2 @@ -31,9 +31,9 @@ password=skysql optimistic_trx=true master_failure_mode=fail_on_write -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -41,7 +41,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1583_fwf b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1583_fwf index 7153f8b7f..6e9fba9b3 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1583_fwf +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1583_fwf @@ -2,7 +2,7 @@ threads=###threads### query_classifier_args=log_unrecognized_statements=3 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1 @@ -10,22 +10,22 @@ user=maxskysql password=skysql monitor_interval=100 -[Database Firewall] +[Database-Firewall] type=filter module=dbfwfilter rules=/###access_homedir###/rules/rules.txt log_match=true log_no_match=true -[RW Split Router] +[RW-Split-Router] type=service router=readconnroute servers=server1 user=maxskysql password=skysql -filters=Database Firewall +filters=Database-Firewall -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -33,7 +33,7 @@ servers=server1 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -41,21 +41,21 @@ servers=server1 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -63,7 +63,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1585 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1585 index fad8a1c2d..866309654 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1585 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1585 @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=server1,server2,server3,server4 @@ -10,7 +10,7 @@ password=skysql monitor_interval=1000 root_node_as_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -18,7 +18,7 @@ user=maxskysql password=skysql master_failure_mode=fail_on_write -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -26,7 +26,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -34,21 +34,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -56,7 +56,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1643_extra_events b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1643_extra_events index 784d0f842..811334eaf 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1643_extra_events +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1643_extra_events @@ -9,16 +9,16 @@ user=maxskysql password= skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -26,7 +26,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1713_lots_of_databases b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1713_lots_of_databases index 41d0a9515..65e383026 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1713_lots_of_databases +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1713_lots_of_databases @@ -1,23 +1,23 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1 user=maxskysql password=skysql -[Sharding router] +[Sharding-router] type=service router=schemarouter servers=server1 user=maxskysql password=skysql -[Sharding Listener] +[Sharding-Listener] type=listener -service=Sharding router +service=Sharding-router protocol=MySQLClient port=4006 @@ -25,7 +25,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1731_empty_param b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1731_empty_param index 43352ba09..87ead2c70 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1731_empty_param +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1731_empty_param @@ -25,7 +25,7 @@ address=###node_server_IP_4### port=###node_server_port_4### protocol=MySQLBackend -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -33,7 +33,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -41,9 +41,9 @@ user=maxskysql password=skysql version_string= -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -51,7 +51,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1743_rconn_bitmask b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1743_rconn_bitmask index 22bde2958..b8785a53a 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1743_rconn_bitmask +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1743_rconn_bitmask @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2 @@ -9,7 +9,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master,slave @@ -17,9 +17,9 @@ servers=server1,server2 user=maxskysql password=skysql -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -27,7 +27,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1751_available_when_donor_crash b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1751_available_when_donor_crash index 246e28397..683fe4a86 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1751_available_when_donor_crash +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1751_available_when_donor_crash @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=server1,server2,server3 @@ -10,7 +10,7 @@ password=skysql monitor_interval=100 available_when_donor=true -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3 @@ -18,9 +18,9 @@ user=maxskysql password=skysql master_accept_reads=true -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -28,7 +28,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1778_causal_reads b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1778_causal_reads index 001aefda7..3b73d4545 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1778_causal_reads +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1778_causal_reads @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -9,7 +9,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -17,9 +17,9 @@ user=maxskysql password=skysql causal_reads=true -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -27,7 +27,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1849_table_sharding b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1849_table_sharding index 1543da66b..0bee39087 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1849_table_sharding +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1849_table_sharding @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Sharding router] +[Sharding-router] type=service router=schemarouter servers=server1,server2,server3,server4 @@ -18,9 +18,9 @@ password=skysql auth_all_servers=1 ignore_databases_regex=.* -[Sharding Listener] +[Sharding-Listener] type=listener -service=Sharding router +service=Sharding-router protocol=MySQLClient port=4006 @@ -28,7 +28,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 index a4d633ec0..2e7e4426d 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 @@ -2,7 +2,7 @@ threads=###threads### log_info=on -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon ###repl51### @@ -11,7 +11,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -20,7 +20,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -36,21 +36,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1926_killed_server b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1926_killed_server index f7bc4a752..ae059e745 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1926_killed_server +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1926_killed_server @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -9,16 +9,16 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -26,7 +26,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_filter_runtime b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_filter_runtime index 584eabd7e..1783ff498 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_filter_runtime +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_filter_runtime @@ -5,7 +5,7 @@ threads=###threads### type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_start_from_scratch b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_start_from_scratch index 584eabd7e..1783ff498 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_start_from_scratch +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_start_from_scratch @@ -5,7 +5,7 @@ threads=###threads### type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1961_standalone_rejoin b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1961_standalone_rejoin index 814467292..c32c140f4 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1961_standalone_rejoin +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1961_standalone_rejoin @@ -20,16 +20,16 @@ replication_password=repl enforce_read_only_slaves=1 verify_master_failure=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -37,7 +37,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1980_blr_galera_server_ids b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1980_blr_galera_server_ids index 2d1897a23..f84dbef7c 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1980_blr_galera_server_ids +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1980_blr_galera_server_ids @@ -19,7 +19,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2037_namedserver_wildcards b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2037_namedserver_wildcards index 1f6510829..2baa2d650 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2037_namedserver_wildcards +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2037_namedserver_wildcards @@ -9,7 +9,7 @@ match01=SELECT target01=server1 source=127.%.%.% -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon ###repl51### @@ -18,7 +18,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -30,13 +30,13 @@ filters=namedserverfilter type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled socket=default -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -44,7 +44,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -52,21 +52,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2047_blr_gtid_path b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2047_blr_gtid_path index 5ace4280d..11bed82af 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2047_blr_gtid_path +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2047_blr_gtid_path @@ -18,7 +18,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2054_hybrid_cluster b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2054_hybrid_cluster index 8a9e942b1..de89113d6 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2054_hybrid_cluster +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2054_hybrid_cluster @@ -29,7 +29,7 @@ port=###node_server_port_4### protocol=MySQLBackend weight=0 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon # Note that server3 and server4 are not monitored @@ -46,7 +46,7 @@ target03=server3 match04=test[.]t4 target04=server4 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -55,9 +55,9 @@ password=skysql filters=hybridizer weightby=weight -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -65,7 +65,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2167_extra_port b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2167_extra_port index de10d1d78..1afc7b491 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2167_extra_port +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2167_extra_port @@ -2,7 +2,7 @@ threads=###threads### log_info=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon ###repl51### @@ -11,16 +11,16 @@ user=maxskysql passwd=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql passwd=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -28,7 +28,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2187_multi_replay b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2187_multi_replay index 1c8ef41ee..1ffdc3978 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2187_multi_replay +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2187_multi_replay @@ -2,7 +2,7 @@ threads=###threads### log_info=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -14,7 +14,7 @@ auto_rejoin=true failcount=1 master_failure_timeout=1 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -23,9 +23,9 @@ password=skysql transaction_replay=true delayed_retry_timeout=30 -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 index 5cd5d85ff..1cd4ea0cc 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=100 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -18,7 +18,7 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -26,7 +26,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -34,22 +34,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -57,14 +57,14 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled #address=localhost socket=default -[RW Split Router Galera] +[RW-Split-Router Galera] type=service router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 @@ -72,13 +72,13 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[RW Split Listener Galera] +[RW-Split-Listener Galera] type=listener -service=RW Split Router Galera +service=RW-Split-Router Galera protocol=MySQLClient port=4016 -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=gserver1,gserver2,gserver3,gserver4 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs421_events b/maxscale-system-test/cnf/maxscale.cnf.template.mxs421_events index f658d419f..2836b13bb 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs421_events +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs421_events @@ -29,7 +29,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs501 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs501 index ba23181b7..1247fda9f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs501 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs501 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -24,9 +24,9 @@ filters=duplicate type=filter module=tee match=insert -service=Read Connection Router Master +service=Read-Connection-Router-Master -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -34,7 +34,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -42,22 +42,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -65,7 +65,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs548 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs548 index 0e60614ef..c25669cc3 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs548 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs548 @@ -2,7 +2,7 @@ threads=1 log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2 @@ -19,7 +19,7 @@ password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1,server2 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,22 +35,22 @@ servers=server1,server2 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs559 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs559 index 25664fa58..9793ae9a4 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs559 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs559 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2 @@ -12,7 +12,7 @@ monitor_interval=1000 backend_connect_timeout=1 backend_read_timeout=1 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2 @@ -21,7 +21,7 @@ password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -29,7 +29,7 @@ servers=server1,server2 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -37,22 +37,22 @@ servers=server1,server2 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -60,7 +60,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 c783ce7fc..027c6a3cb 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs710_bad_socket +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs710_bad_socket @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -11,7 +11,7 @@ password= skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -20,7 +20,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -36,23 +36,23 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock socket=/var/lib/mysqld/mysql.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -60,7 +60,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 606e78e15..3c54f576a 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs711_two_ports +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs711_two_ports @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -11,7 +11,7 @@ password= skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -20,7 +20,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -36,27 +36,27 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[RW Split Listener1] +[RW-Split-Listener1] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=22 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -64,7 +64,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 b80c659e0..94216d909 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 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -20,7 +20,7 @@ slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 line_no_equal -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -36,22 +36,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -59,7 +59,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 6b162bd50..7fd8f1267 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_wierd_line +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_wierd_line @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -19,7 +19,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -29,7 +29,7 @@ password=skysql hren=hren' укпоукц=так_и_крешнуться_можно -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -37,22 +37,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -60,7 +60,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 index 4d171fd45..fe8ba900b 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -10,7 +10,7 @@ password=skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -20,7 +20,7 @@ slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 filters=QLA -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -29,7 +29,7 @@ user=maxskysql password=skysql filters=QLA -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -43,32 +43,32 @@ type=filter module=qlafilter filebase=/tmp/QueryLog -[Debug Interface] +[Debug-Interface] type=service router=debugcli -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 -[Debug Listener] +[Debug-Listener] type=listener -service=Debug Interface +service=Debug-Interface protocol=telnetd port=4442 @@ -76,7 +76,7 @@ port=4442 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs799 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs799 index b96a0c72e..d88b10724 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs799 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs799 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=server1,server2,server3,server4 @@ -10,14 +10,14 @@ user=maxskysql password=skysql root_node_as_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -25,7 +25,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -33,24 +33,24 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 socket=/var/run/mysqld/mysqld.sock #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -82,7 +82,7 @@ protocol=MySQLBackend type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 2f9094b66..7e7bfe0f4 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -10,7 +10,7 @@ password=skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -20,7 +20,7 @@ slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 connection_keepalive=5 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -36,21 +36,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs874 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs874 index 54699f0e6..c1a4d6b20 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs874 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs874 @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3 @@ -10,7 +10,7 @@ password=skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3 @@ -19,7 +19,7 @@ user=maxskysql password=skysql max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -27,7 +27,7 @@ servers=server1,server2,server3 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,21 +35,21 @@ servers=server1,server2,server3 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -57,7 +57,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs922 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs922 index 7f4d7b939..2a9cca39d 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs922 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs922 @@ -49,7 +49,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs922_base b/maxscale-system-test/cnf/maxscale.cnf.template.mxs922_base index 81b609976..8a8ccd4a6 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs922_base +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs922_base @@ -25,7 +25,7 @@ password=skysql type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_backup b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_backup index 564ec35a7..3ac2578c5 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_backup +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_backup @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -9,7 +9,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -17,7 +17,7 @@ user=maxskysql password=skysql master_failure_mode=fail_on_write -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -25,7 +25,7 @@ servers=server1,server2 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -33,21 +33,21 @@ servers=server1,server2 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -55,7 +55,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_detect_standalone_master b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_detect_standalone_master index d257e00f7..6d2088f4e 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_detect_standalone_master +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_detect_standalone_master @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2, server3, server4 @@ -15,14 +15,14 @@ backend_connect_timeout=10 backend_read_timeout=10 backend_write_timeout=10 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -30,7 +30,7 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -38,21 +38,21 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -60,7 +60,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_external_master b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_external_master index 192279b77..7357fe8b3 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_external_master +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_external_master @@ -20,16 +20,16 @@ backend_connect_timeout=10 backend_read_timeout=10 backend_write_timeout=10 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -37,7 +37,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_auto b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_auto index 9699f6d72..e388600ea 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_auto +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_auto @@ -18,14 +18,14 @@ backend_connect_timeout=10 backend_read_timeout=10 backend_write_timeout=10 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -33,7 +33,7 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -41,21 +41,21 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -63,7 +63,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual index ee95040d7..e892a7e37 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual @@ -17,14 +17,14 @@ backend_connect_timeout=10 backend_read_timeout=10 backend_write_timeout=10 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -32,7 +32,7 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -40,21 +40,21 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -62,7 +62,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_2 b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_2 index da63ebf1d..bacbe9039 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_2 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_2 @@ -62,7 +62,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_3 b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_3 index 49668740b..69d9c5480 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_3 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_3 @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2, server3 @@ -17,7 +17,7 @@ backend_connect_timeout=10 backend_read_timeout=10 backend_write_timeout=10 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3 @@ -42,7 +42,7 @@ password=skysql [RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -52,7 +52,7 @@ service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener service=Read-Connection-Router-Master protocol=MySQLClient @@ -62,7 +62,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_4 b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_4 index 224c6347a..2c1126a30 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_4 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_4 @@ -62,7 +62,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_readonly b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_readonly index e042c153e..6ef5d1ce7 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_readonly +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_readonly @@ -37,7 +37,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rejoin_old_slave b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rejoin_old_slave index 2a74b0601..b3cf8326a 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rejoin_old_slave +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rejoin_old_slave @@ -64,7 +64,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_master b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_master index df398371d..900ca59fa 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_master +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_master @@ -62,7 +62,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_restart_slaves b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_restart_slaves index a1821c937..d9e9880fe 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_restart_slaves +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_restart_slaves @@ -63,7 +63,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_stress b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_stress index 2a74b0601..b3cf8326a 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_stress +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_stress @@ -64,7 +64,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_multimaster b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_multimaster index 749147a54..fd7a0d8ea 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_multimaster +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_multimaster @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2, server3, server4 @@ -11,7 +11,7 @@ password= skysql detect_stale_master=0 monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3, server4 @@ -19,7 +19,7 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1,server2 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,21 +35,21 @@ servers=server1,server2 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -57,7 +57,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_multimaster_serverid b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_multimaster_serverid index 749147a54..fd7a0d8ea 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_multimaster_serverid +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_multimaster_serverid @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2, server3, server4 @@ -11,7 +11,7 @@ password= skysql detect_stale_master=0 monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3, server4 @@ -19,7 +19,7 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1,server2 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,21 +35,21 @@ servers=server1,server2 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -57,7 +57,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_good b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_good index 21d99f979..69edb7e8e 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_good +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_good @@ -19,14 +19,14 @@ backend_write_timeout=10 auto_failover=true auto_rejoin=true -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -34,7 +34,7 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -42,21 +42,21 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -64,7 +64,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_manual b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_manual index 33bba7c5f..3f054a7fb 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_manual +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_manual @@ -18,14 +18,14 @@ backend_read_timeout=10 backend_write_timeout=10 auto_failover=true -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -33,7 +33,7 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -41,21 +41,21 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -63,7 +63,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover index 3355a8dc8..cfddc6c3b 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover @@ -63,7 +63,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_auto b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_auto index 7b58abda2..750c09362 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_auto +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_auto @@ -20,14 +20,14 @@ switchover_on_low_disk_space=true disk_space_check_interval=2000 disk_space_threshold=/:90 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql password=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -35,7 +35,7 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -43,21 +43,21 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -65,7 +65,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_bad_master b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_bad_master index d508672e0..ba966aeac 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_bad_master +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_bad_master @@ -64,7 +64,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_stress b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_stress index 3c6bd7371..5050a38c3 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_stress +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_stress @@ -63,7 +63,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.namedserverfilter b/maxscale-system-test/cnf/maxscale.cnf.template.namedserverfilter index 163c92da5..dfa4ec038 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.namedserverfilter +++ b/maxscale-system-test/cnf/maxscale.cnf.template.namedserverfilter @@ -8,7 +8,7 @@ module=namedserverfilter match=SELECT server=server2 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -16,7 +16,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit @@ -30,13 +30,13 @@ filters=namedserverfilter type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled socket=default -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -44,7 +44,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -52,21 +52,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.nsfilter b/maxscale-system-test/cnf/maxscale.cnf.template.nsfilter index 42bbc8229..012708955 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.nsfilter +++ b/maxscale-system-test/cnf/maxscale.cnf.template.nsfilter @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1, server2, server3, server4 @@ -10,7 +10,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1, server2, server3, server4 @@ -24,7 +24,7 @@ module=namedserverfilter match=test server=server1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -32,7 +32,7 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -40,21 +40,21 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -62,7 +62,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.old_passwd b/maxscale-system-test/cnf/maxscale.cnf.template.old_passwd index e84aca8d2..55681d3cb 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.old_passwd +++ b/maxscale-system-test/cnf/maxscale.cnf.template.old_passwd @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2 @@ -11,16 +11,16 @@ monitor_interval=1000 detect_stale_master=false detect_standalone_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2 user=maxskysql passwd=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -28,7 +28,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.open_close b/maxscale-system-test/cnf/maxscale.cnf.template.open_close index 56d877d61..76168dc75 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.open_close +++ b/maxscale-system-test/cnf/maxscale.cnf.template.open_close @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -19,7 +19,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,22 +35,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 b/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 index 494359466..28d14085e 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=100 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -18,7 +18,7 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -26,7 +26,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -34,22 +34,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -57,14 +57,14 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled #address=localhost socket=default -[RW Split Router Galera] +[RW-Split-Router Galera] type=service router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 @@ -72,13 +72,13 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[RW Split Listener Galera] +[RW-Split-Listener Galera] type=listener -service=RW Split Router Galera +service=RW-Split-Router Galera protocol=MySQLClient port=4016 -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=gserver1,gserver2,gserver3,gserver4 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.proxy_protocol b/maxscale-system-test/cnf/maxscale.cnf.template.proxy_protocol index d8fa0177b..43af56b72 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.proxy_protocol +++ b/maxscale-system-test/cnf/maxscale.cnf.template.proxy_protocol @@ -12,14 +12,14 @@ detect_standalone_master=true failcount=1 allow_cluster_recovery=true -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1 user=maxskysql passwd=skysql -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1 user=maxskysql passwd=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,21 +35,21 @@ servers=server1 user=maxskysql passwd=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -57,7 +57,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.regexfilter1 b/maxscale-system-test/cnf/maxscale.cnf.template.regexfilter1 index fdefa71a4..aada3fad4 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.regexfilter1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.regexfilter1 @@ -9,7 +9,7 @@ module=regexfilter match=SELECT [1-5]* replace=SELECT 0 -[Read Connection Router 1] +[Read-Connection-Router-1] type=service router=readconnroute servers=server1,server2,server3,server4 @@ -17,9 +17,9 @@ user=maxskysql password=skysql filters=regex1 -[Read Connection Listener 1] +[Read-Connection-Listener-1] type=listener -service=Read Connection Router 1 +service=Read-Connection-Router-1 protocol=MySQLClient port=4006 @@ -31,7 +31,7 @@ match=SELECT [1-5]* replace=SELECT 0 user=bad_username -[Read Connection Router 2] +[Read-Connection-Router-2] type=service router=readconnroute router_options=slave @@ -40,9 +40,9 @@ user=maxskysql password=skysql filters=regex2 -[Read Connection Listener 2] +[Read-Connection-Listener-2] type=listener -service=Read Connection Router 2 +service=Read-Connection-Router-2 protocol=MySQLClient port=4008 @@ -54,7 +54,7 @@ match=SELECT [1-5]* replace=SELECT 0 source=127.0.0.1 -[Read Connection Router 3] +[Read-Connection-Router-3] type=service router=readconnroute router_options=master @@ -63,13 +63,13 @@ user=maxskysql password=skysql filters=regex3 -[Read Connection Listener 3] +[Read-Connection-Listener-3] type=listener -service=Read Connection Router 3 +service=Read-Connection-Router-3 protocol=MySQLClient port=4009 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1,server2,server3,server4 @@ -105,7 +105,7 @@ protocol=MySQLBackend type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc b/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc index c5ef7a076..7fa986a46 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc +++ b/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -19,7 +19,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,22 +35,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication b/maxscale-system-test/cnf/maxscale.cnf.template.replication index b3eafebe4..a6a26cd85 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.replication +++ b/maxscale-system-test/cnf/maxscale.cnf.template.replication @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -11,7 +11,7 @@ monitor_interval=1000 detect_stale_master=false detect_standalone_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -20,7 +20,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -36,21 +36,21 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 b/maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 index 67f17ff75..c86657727 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 @@ -6,7 +6,7 @@ log_warning=1 type=filter module=hintfilter -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -17,13 +17,13 @@ user=maxskysql password=skysql filters=hints -[Client Interface] +[Client-Interface] type=service router=cli -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 socket=/tmp/rwsplit.sock 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 a773b8694..7f86188a0 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave +++ b/maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit max_slave_connections=1 @@ -18,7 +18,7 @@ user=maxskysql password=skysql disable_sescmd_history=false -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -26,7 +26,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -34,22 +34,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -57,7 +57,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 3c4108178..b758c71ac 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt +++ b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt @@ -2,7 +2,7 @@ threads=###threads### log_info=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -11,7 +11,7 @@ password=skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2 @@ -19,7 +19,7 @@ user=maxskysql password=skysql strict_multi_stmt=true -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -27,7 +27,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,22 +35,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly index 471ddd317..b9cc8270d 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly +++ b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -9,7 +9,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -17,7 +17,7 @@ user=maxskysql password=skysql master_failure_mode=fail_instantly -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -25,7 +25,7 @@ user=maxskysql password=skysql master_failure_mode=error_on_write -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -33,15 +33,15 @@ user=maxskysql password=skysql master_failure_mode=fail_on_write -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 @@ -49,15 +49,15 @@ port=4009 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled socket=default -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.schemarouter_duplicate b/maxscale-system-test/cnf/maxscale.cnf.template.schemarouter_duplicate index 8a8cf1724..f803f186c 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.schemarouter_duplicate +++ b/maxscale-system-test/cnf/maxscale.cnf.template.schemarouter_duplicate @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Sharding router] +[Sharding-router] type=service router=schemarouter servers=server1,server2,server3,server4 @@ -17,9 +17,9 @@ user=maxskysql password=skysql auth_all_servers=1 -[Sharding Listener] +[Sharding-Listener] type=listener -service=Sharding router +service=Sharding-router protocol=MySQLClient port=4006 @@ -27,7 +27,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.script b/maxscale-system-test/cnf/maxscale.cnf.template.script index 7e0d5203a..4de5f9ec8 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.script +++ b/maxscale-system-test/cnf/maxscale.cnf.template.script @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -12,7 +12,7 @@ script=/###access_homedir###/script/script.sh --event=$EVENT --initiator=$INITIA events=master_down,master_up, slave_up, server_down ,server_up,lost_master,lost_slave,new_master,new_slave monitor_interval=1000 -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=gserver1,gserver2,gserver3,gserver4 @@ -24,7 +24,7 @@ user=maxskysql password=skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -32,7 +32,7 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[RW Split Router Galera] +[RW-Split-Router Galera] type=service router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 @@ -40,7 +40,7 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -48,7 +48,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -56,29 +56,29 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[RW Split Listener Galera] +[RW-Split-Listener Galera] type=listener -service=RW Split Router Galera +service=RW-Split-Router Galera protocol=MySQLClient port=4016 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -86,7 +86,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.server_weight b/maxscale-system-test/cnf/maxscale.cnf.template.server_weight index 77dd5d68a..29ae2159c 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.server_weight +++ b/maxscale-system-test/cnf/maxscale.cnf.template.server_weight @@ -1,14 +1,14 @@ [maxscale] threads=###threads### -[Mariadb Monitor] +[Mariadb-Monitor] type=monitor module=mariadbmon servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 @@ -18,7 +18,7 @@ max_slave_connections=1 user=maxskysql password=skysql -[Read Connection Router] +[Read-Connection-Router] type=service router=readconnroute router_options=running @@ -27,15 +27,15 @@ weightby=serversize user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener] +[Read-Connection-Listener] type=listener -service=Read Connection Router +service=Read-Connection-Router protocol=MySQLClient port=4008 @@ -43,7 +43,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.session_limits b/maxscale-system-test/cnf/maxscale.cnf.template.session_limits index 1dac830de..211e91388 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.session_limits +++ b/maxscale-system-test/cnf/maxscale.cnf.template.session_limits @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] connection_timeout=10 type=service router= readwritesplit @@ -20,7 +20,7 @@ slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_sescmd_history=10 disable_sescmd_history=false -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -36,22 +36,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -59,7 +59,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog index 493eee516..31aea1f37 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog @@ -8,7 +8,7 @@ user=skysql password=skysql router_options=server_id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -18,7 +18,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in index 493eee516..31aea1f37 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in @@ -8,7 +8,7 @@ user=skysql password=skysql router_options=server_id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -18,7 +18,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 index c0f50b7f0..4be0c4912 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 @@ -8,7 +8,7 @@ user=skysql password=skysql router_options=server_id=9993,send_slave_heartbeat=On,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -18,7 +18,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 index 88e995be5..f5785412e 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 @@ -8,7 +8,7 @@ user=skysql password=skysql router_options=server_id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,transaction_safety=1,mariadb10-compatibility=1 -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -18,7 +18,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_gtid b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_gtid index 95b5d45bd..22a62a0bd 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_gtid +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_gtid @@ -9,7 +9,7 @@ password=skysql version_string=5.6.15-log router_options=server_id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10_master_gtid=on,mariadb10_slave_gtid=on,transaction_safety=on,mariadb10-compatibility=1 -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -19,7 +19,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync index bf16581a2..9500bc79d 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync @@ -8,7 +8,7 @@ user=skysql password=skysql router_options=server_id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=1,transaction_safety=1,mariadb10-compatibility=1 -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -18,7 +18,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 index 7849b5324..91991b0b4 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 @@ -8,7 +8,7 @@ user=skysql password=skysql router_options=server_id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=0,transaction_safety=0,mariadb10-compatibility=1 -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -18,7 +18,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 index d2a517ada..c258d20c0 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 @@ -8,7 +8,7 @@ user=skysql password=skysql router_options=server_id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=1,transaction_safety=0,mariadb10-compatibility=1 -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -18,7 +18,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 index 7c16f0761..ec282bf4f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 @@ -8,7 +8,7 @@ user=skysql password=skysql router_options=server_id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=0,transaction_safety=1,mariadb10-compatibility=1 -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -18,7 +18,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe index 88e995be5..f5785412e 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe @@ -8,7 +8,7 @@ user=skysql password=skysql router_options=server_id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,transaction_safety=1,mariadb10-compatibility=1 -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -18,7 +18,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe_gtid b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe_gtid index 95b5d45bd..22a62a0bd 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe_gtid +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe_gtid @@ -9,7 +9,7 @@ password=skysql version_string=5.6.15-log router_options=server_id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10_master_gtid=on,mariadb10_slave_gtid=on,transaction_safety=on,mariadb10-compatibility=1 -[Binlog Listener] +[Binlog-Listener] type=listener service=Binlog_Service protocol=MySQLClient @@ -19,7 +19,7 @@ port=5306 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.sharding b/maxscale-system-test/cnf/maxscale.cnf.template.sharding index 9d8a99454..2979bb808 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.sharding +++ b/maxscale-system-test/cnf/maxscale.cnf.template.sharding @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Sharding router] +[Sharding-router] type=service router=schemarouter servers=server1,server2,server3,server4 @@ -18,9 +18,9 @@ password=skysql auth_all_servers=1 ignore_databases_regex=.* -[Sharding Listener] +[Sharding-Listener] type=listener -service=Sharding router +service=Sharding-router protocol=MySQLClient port=4006 @@ -28,7 +28,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 c92181d7f..0d57ea78c 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.show_monitor_crash +++ b/maxscale-system-test/cnf/maxscale.cnf.template.show_monitor_crash @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -11,7 +11,7 @@ password= skysql monitor_interval=1000 detect_stale_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -20,7 +20,7 @@ password=skysql slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -28,7 +28,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -36,22 +36,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -59,7 +59,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest b/maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest index c3a7c2ea4..9f9bbd2e0 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest +++ b/maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -20,7 +20,7 @@ slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=5.5.5-10.0.0-mxs -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -29,7 +29,7 @@ user=maxskysql password=skysql version_string=5.5.5-10.0.0-mxs -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -38,21 +38,21 @@ user=maxskysql password=skysql version_string=5.5.5-10.0.0-mxs -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -60,7 +60,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 d3311e776..7434a8c87 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers1 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -19,7 +19,7 @@ password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,22 +35,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 b20cc8ed6..ebc43d76a 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers10 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers10 @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 @@ -10,7 +10,7 @@ user=maxskysql password= skysql monitor_interval=1000 -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -19,7 +19,7 @@ password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,22 +35,22 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -58,7 +58,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ssl b/maxscale-system-test/cnf/maxscale.cnf.template.ssl index 36a8c85b5..bcb28a863 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.ssl +++ b/maxscale-system-test/cnf/maxscale.cnf.template.ssl @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1, server2, server3,server4 @@ -17,7 +17,7 @@ user=maxskysql password=skysql slave_selection_criteria=LEAST_ROUTER_CONNECTIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -25,7 +25,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -33,9 +33,9 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock @@ -45,15 +45,15 @@ ssl_key=/###access_homedir###/certs/server-key.pem ssl_ca_cert=/###access_homedir###/certs/ca.pem ssl_version=TLSv12 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -61,7 +61,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load index 611673cd4..722e3316d 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load +++ b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load @@ -2,14 +2,14 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql password= skysql -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -18,7 +18,7 @@ password=skysql max_slave_connections=100% slave_selection_criteria=LEAST_CURRENT_OPERATIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -26,7 +26,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -34,9 +34,9 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock @@ -46,9 +46,9 @@ ssl_key=/###access_homedir###/certs/server-key.pem ssl_ca_cert=/###access_homedir###/certs/ca.pem ssl_version=TLSv12 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 ssl=required @@ -57,9 +57,9 @@ ssl_key=/###access_homedir###/certs/server-key.pem ssl_ca_cert=/###access_homedir###/certs/ca.pem ssl_version=TLSv12 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 ssl=required @@ -72,7 +72,7 @@ ssl_version=TLSv12 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled 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 79f8f1c33..06cb00c5b 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera +++ b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[Galera Monitor] +[Galera-Monitor] type=monitor module=galeramon servers=server1,server2,server3,server4 @@ -10,7 +10,7 @@ user=maxskysql password=skysql root_node_as_master=false -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 @@ -19,7 +19,7 @@ password=skysql max_slave_connections=100% slave_selection_criteria=LEAST_CURRENT_OPERATIONS -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options= slave @@ -27,7 +27,7 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -35,9 +35,9 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 #socket=/tmp/rwsplit.sock @@ -47,9 +47,9 @@ ssl_key=/###access_homedir###/certs/server-key.pem ssl_ca_cert=/###access_homedir###/certs/ca.pem ssl_version=TLSv12 -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 ssl=required @@ -58,9 +58,9 @@ ssl_key=/###access_homedir###/certs/server-key.pem ssl_ca_cert=/###access_homedir###/certs/ca.pem ssl_version=TLSv12 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 ssl=required @@ -73,7 +73,7 @@ ssl_version=TLSv12 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.stale_slaves b/maxscale-system-test/cnf/maxscale.cnf.template.stale_slaves index 9849e60cb..42fe0c742 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.stale_slaves +++ b/maxscale-system-test/cnf/maxscale.cnf.template.stale_slaves @@ -1,7 +1,7 @@ [maxscale] threads=###threads### -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -10,7 +10,7 @@ password=skysql monitor_interval=1000 failcount=1 -[Read Connection Router Slave] +[Read-Connection-Router-Slave] type=service router=readconnroute router_options=slave @@ -18,9 +18,9 @@ servers=server1,server2,server3,server4 user=maxskysql password=skysql -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=Read Connection Router Slave +service=Read-Connection-Router-Slave protocol=MySQLClient port=4009 @@ -28,7 +28,7 @@ port=4009 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.user_cache b/maxscale-system-test/cnf/maxscale.cnf.template.user_cache index ba90b15bd..62c6eae4a 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.user_cache +++ b/maxscale-system-test/cnf/maxscale.cnf.template.user_cache @@ -2,7 +2,7 @@ threads=###threads### log_warning=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers= server1,server2,server3,server4 @@ -15,14 +15,14 @@ detect_stale_master=false # The 'testuser'@'%' user will be created as a part of the test # -[RW Split Router] +[RW-Split-Router] type=service router= readwritesplit servers=server1,server2,server3,server4 user=testuser password=testpasswd -[Read Connection Router Master] +[Read-Connection-Router-Master] type=service router=readconnroute router_options=master @@ -30,9 +30,9 @@ servers=server1,server2,server3,server4 user=testuser password=testpasswd -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -40,15 +40,15 @@ port=4006 # This listener will have its own user cache # -[Read Connection Listener Slave] +[Read-Connection-Listener-Slave] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4009 -[Read Connection Listener Master] +[Read-Connection-Listener-Master] type=listener -service=Read Connection Router Master +service=Read-Connection-Router-Master protocol=MySQLClient port=4008 @@ -56,7 +56,7 @@ port=4008 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.verify_master_failure b/maxscale-system-test/cnf/maxscale.cnf.template.verify_master_failure index dbaf703fb..791779cfe 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.verify_master_failure +++ b/maxscale-system-test/cnf/maxscale.cnf.template.verify_master_failure @@ -2,7 +2,7 @@ threads=###threads### log_info=1 -[MySQL Monitor] +[MySQL-Monitor] type=monitor module=mysqlmon servers=server1,server2,server3,server4 @@ -11,16 +11,16 @@ password=skysql monitor_interval=1000 auto_failover=true -[RW Split Router] +[RW-Split-Router] type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql password=skysql -[RW Split Listener] +[RW-Split-Listener] type=listener -service=RW Split Router +service=RW-Split-Router protocol=MySQLClient port=4006 @@ -28,7 +28,7 @@ port=4006 type=service router=cli -[CLI Listener] +[CLI-Listener] type=listener service=CLI protocol=maxscaled