Increase verbosity and timeouts in bug662

The test restarts MaxScale while all backends are blocked. This will cause
MaxScale to wait until all connections to all servers time out which can
take a while.

Added a separate config for the test and lowered the timeouts. Also
inreased test timeouts.
This commit is contained in:
Markus Mäkelä 2017-07-06 13:59:44 +03:00
parent 61cfd92510
commit 54c6e0eb52
3 changed files with 98 additions and 2 deletions

View File

@ -187,7 +187,7 @@ add_test_executable(bug654.cpp bug654 replication LABELS maxscale REPL_BACKEND)
add_test_executable(bug658.cpp bug658 replication LABELS readwritesplit readconnroute maxscale REPL_BACKEND)
# Block all backends
add_test_executable(bug662.cpp bug662 replication LABELS readwritesplit readconnroute maxscale REPL_BACKEND)
add_test_executable(bug662.cpp bug662 bug662 LABELS readwritesplit readconnroute maxscale REPL_BACKEND)
# Bad TEE filter configuration
add_test_executable(bug664.cpp bug664 bug664 LABELS MySQLAuth MySQLProtocol)

View File

@ -49,7 +49,8 @@ int main(int argc, char *argv[])
fflush(stdout);
}
Test->set_timeout(100);
Test->set_timeout(200);
Test->tprintf("Restarting MaxScale");
Test->restart_maxscale();
Test->set_timeout(20);

View File

@ -0,0 +1,95 @@
[maxscale]
threads=###threads###
auth_connect_timeout=1
auth_read_timeout=1
auth_write_timeout=1
[MySQL Monitor]
type=monitor
module=mysqlmon
###repl51###
servers=server1,server2,server3,server4
user=maxskysql
passwd=skysql
monitor_interval=1000
detect_stale_master=false
backend_connect_timeout=1
backend_read_timeout=1
backend_write_timeout=1
[RW Split Router]
type=service
router=readwritesplit
servers=server1,server2,server3,server4
user=maxskysql
passwd=skysql
router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1
[Read Connection Router Slave]
type=service
router=readconnroute
router_options=slave
servers=server1,server2,server3,server4
user=maxskysql
passwd=skysql
[Read Connection Router Master]
type=service
router=readconnroute
router_options=master
servers=server1,server2,server3,server4
user=maxskysql
passwd=skysql
[RW Split Listener]
type=listener
service=RW Split Router
protocol=MySQLClient
port=4006
[Read Connection Listener Slave]
type=listener
service=Read Connection Router Slave
protocol=MySQLClient
port=4009
[Read Connection Listener Master]
type=listener
service=Read Connection Router Master
protocol=MySQLClient
port=4008
[CLI]
type=service
router=cli
[CLI Listener]
type=listener
service=CLI
protocol=maxscaled
socket=default
[server1]
type=server
address=###node_server_IP_1###
port=###node_server_port_1###
protocol=MySQLBackend
[server2]
type=server
address=###node_server_IP_2###
port=###node_server_port_2###
protocol=MySQLBackend
[server3]
type=server
address=###node_server_IP_3###
port=###node_server_port_3###
protocol=MySQLBackend
[server4]
type=server
address=###node_server_IP_4###
port=###node_server_port_4###
protocol=MySQLBackend