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 5c4a9145a..9cbe7dce7 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 @@ -11,9 +11,9 @@ monitor_interval=1000 detect_standalone_master=true failcount=2 allow_cluster_recovery=false -backend_connect_timeout=2 -backend_read_timeout=3 -backend_write_timeout=3 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 [RW Split Router] type=service 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 3fe144c9a..b79f8227f 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_external_master +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_external_master @@ -16,6 +16,9 @@ auto_rejoin=true replication_user=repl replication_password=repl ignore_external_masters=true +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 [RW Split Router] type=service 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 269d42840..833349308 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_auto +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_auto @@ -14,9 +14,9 @@ allow_cluster_recovery=true auto_failover=true replication_user=repl replication_password=repl -backend_connect_timeout=15 -backend_read_timeout=15 -backend_write_timeout=15 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 [RW Split Router] type=service 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 42401ef0c..1d44c4e6b 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual @@ -13,9 +13,9 @@ failcount=1 allow_cluster_recovery=true replication_user=repl replication_password=repl -backend_connect_timeout=15 -backend_read_timeout=15 -backend_write_timeout=15 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 [RW Split Router] type=service 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 72c5c1159..6592a4be9 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 @@ -13,7 +13,9 @@ detect_standalone_master=true auto_failover=false replication_user=repl replication_password=repl -backend_connect_timeout=1 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 [RW-Split-Router] type=service 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 cab5af09e..9f063108e 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 @@ -13,7 +13,9 @@ detect_standalone_master=true auto_failover=false replication_user=repl replication_password=repl -backend_connect_timeout=1 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 [RW Split Router] type=service 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 d82b48ad8..9674e7f98 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 @@ -13,7 +13,9 @@ detect_standalone_master=true auto_failover=false replication_user=repl replication_password=repl -backend_connect_timeout=1 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 [RW-Split-Router] type=service 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 c9da3d2ad..109fd45b7 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 @@ -14,7 +14,9 @@ auto_failover=true auto_rejoin=true replication_user=repl replication_password=repl -backend_connect_timeout=1 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 [RW-Split-Router] type=service 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 27938b8be..99a804128 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 @@ -13,7 +13,9 @@ detect_standalone_master=true auto_failover=true replication_user=repl replication_password=repl -backend_connect_timeout=1 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 [RW-Split-Router] type=service 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 c9da3d2ad..109fd45b7 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 @@ -14,7 +14,9 @@ auto_failover=true auto_rejoin=true replication_user=repl replication_password=repl -backend_connect_timeout=1 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 [RW-Split-Router] type=service 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 1de5c5fb8..109fd45b7 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_stress +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_stress @@ -14,9 +14,9 @@ auto_failover=true auto_rejoin=true replication_user=repl replication_password=repl -backend_connect_timeout=5 -backend_read_timeout=5 -backend_write_timeout=5 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 [RW-Split-Router] type=service 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 e8075749d..a12d53d1f 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_good +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_good @@ -13,9 +13,9 @@ failcount=1 allow_cluster_recovery=true replication_user=repl replication_password=repl -backend_connect_timeout=3 -backend_read_timeout=3 -backend_write_timeout=3 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 auto_failover=true auto_rejoin=true 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 dc66d89ce..686ca30de 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_manual +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_manual @@ -13,9 +13,9 @@ failcount=1 allow_cluster_recovery=true replication_user=repl replication_password=repl -backend_connect_timeout=3 -backend_read_timeout=3 -backend_write_timeout=3 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 auto_failover=true [RW Split Router] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover index 94b16058f..36134109e 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover @@ -14,9 +14,9 @@ auto_failover=false auto_rejoin=true replication_user=repl replication_password=repl -backend_connect_timeout=5 -backend_read_timeout=5 -backend_write_timeout=5 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 [RW-Split-Router] type=service 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 4a8399367..b64456030 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_stress +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_stress @@ -14,9 +14,9 @@ auto_failover=false auto_rejoin=false replication_user=repl replication_password=repl -backend_connect_timeout=5 -backend_read_timeout=5 -backend_write_timeout=5 +backend_connect_timeout=10 +backend_read_timeout=10 +backend_write_timeout=10 [RW-Split-Router] type=service