From 0f3ec4f42e500ce518f362cf25a5ba455a695c53 Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Thu, 13 Jun 2019 11:05:19 +0300 Subject: [PATCH] Remove "allow_cluster_recovery" from test configs The parameter has been removed. --- .../cnf/maxscale.cnf.template.mxs1961_standalone_rejoin | 1 - .../cnf/maxscale.cnf.template.mysqlmon_external_master | 1 - .../cnf/maxscale.cnf.template.mysqlmon_failover_auto | 1 - .../cnf/maxscale.cnf.template.mysqlmon_failover_manual | 1 - .../cnf/maxscale.cnf.template.mysqlmon_failover_manual2_2 | 1 - .../cnf/maxscale.cnf.template.mysqlmon_failover_manual2_3 | 1 - .../cnf/maxscale.cnf.template.mysqlmon_failover_manual2_4 | 1 - .../cnf/maxscale.cnf.template.mysqlmon_failover_rejoin_old_slave | 1 - .../cnf/maxscale.cnf.template.mysqlmon_failover_rolling_master | 1 - ...axscale.cnf.template.mysqlmon_failover_rolling_restart_slaves | 1 - .../cnf/maxscale.cnf.template.mysqlmon_failover_stress | 1 - .../cnf/maxscale.cnf.template.mysqlmon_rejoin_good | 1 - .../cnf/maxscale.cnf.template.mysqlmon_rejoin_manual | 1 - .../cnf/maxscale.cnf.template.mysqlmon_switchover | 1 - .../cnf/maxscale.cnf.template.mysqlmon_switchover_bad_master | 1 - .../cnf/maxscale.cnf.template.mysqlmon_switchover_stress | 1 - maxscale-system-test/cnf/maxscale.cnf.template.proxy_protocol | 1 - 17 files changed, 17 deletions(-) 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 c32c140f4..21453045e 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1961_standalone_rejoin +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1961_standalone_rejoin @@ -12,7 +12,6 @@ password= skysql monitor_interval=1000 detect_standalone_master=true failcount=1 -allow_cluster_recovery=true auto_failover=true auto_rejoin=true replication_user=repl 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 7357fe8b3..d7245fbcf 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_external_master +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_external_master @@ -10,7 +10,6 @@ password=skysql monitor_interval=1000 detect_standalone_master=true failcount=1 -allow_cluster_recovery=true auto_failover=true auto_rejoin=true replication_user=repl 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 e388600ea..0be545003 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_auto +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_auto @@ -10,7 +10,6 @@ password= skysql monitor_interval=1000 detect_standalone_master=true failcount=1 -allow_cluster_recovery=true auto_failover=true replication_user=repl replication_password=repl 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 e892a7e37..c7f7a12f7 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual @@ -10,7 +10,6 @@ password= skysql monitor_interval=1000 detect_standalone_master=true failcount=1 -allow_cluster_recovery=true replication_user=repl replication_password=repl backend_connect_timeout=10 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 bacbe9039..cddb922aa 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 @@ -8,7 +8,6 @@ servers= server1, server2 user=maxskysql password= skysql monitor_interval=1000 -allow_cluster_recovery=true detect_standalone_master=true auto_failover=false replication_user=repl 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 69d9c5480..882ed0a87 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 @@ -8,7 +8,6 @@ servers= server1, server2, server3 user=maxskysql password= skysql monitor_interval=1000 -allow_cluster_recovery=true detect_standalone_master=true auto_failover=false replication_user=repl 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 2c1126a30..a911228e3 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 @@ -8,7 +8,6 @@ servers= server1, server2, server3, server4 user=maxskysql password= skysql monitor_interval=1000 -allow_cluster_recovery=true detect_standalone_master=true auto_failover=false replication_user=repl 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 b3cf8326a..5039d71d1 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 @@ -8,7 +8,6 @@ servers= server1, server2, server3, server4 user=maxskysql password= skysql monitor_interval=1000 -allow_cluster_recovery=true detect_standalone_master=true auto_failover=true auto_rejoin=true 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 900ca59fa..15024cb6b 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 @@ -8,7 +8,6 @@ servers= server1, server2, server3, server4 user=maxskysql password= skysql monitor_interval=1000 -allow_cluster_recovery=true detect_standalone_master=true auto_failover=true replication_user=repl 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 d9e9880fe..b62accd13 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 @@ -8,7 +8,6 @@ servers= server1, server2, server3, server4 user=maxskysql password= skysql monitor_interval=1000 -allow_cluster_recovery=true detect_standalone_master=true auto_failover=true auto_rejoin=true 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 b3cf8326a..5039d71d1 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_stress +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_stress @@ -8,7 +8,6 @@ servers= server1, server2, server3, server4 user=maxskysql password= skysql monitor_interval=1000 -allow_cluster_recovery=true detect_standalone_master=true auto_failover=true auto_rejoin=true 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 69edb7e8e..455fd8929 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_good +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_good @@ -10,7 +10,6 @@ password= skysql monitor_interval=1000 detect_standalone_master=true failcount=1 -allow_cluster_recovery=true replication_user=repl replication_password=repl backend_connect_timeout=10 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 3f054a7fb..6e67986fa 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_manual +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_manual @@ -10,7 +10,6 @@ password= skysql monitor_interval=1000 detect_standalone_master=true failcount=1 -allow_cluster_recovery=true replication_user=repl replication_password=repl backend_connect_timeout=10 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover index cfddc6c3b..74294f493 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover @@ -8,7 +8,6 @@ servers= server1, server2, server3, server4 user=maxskysql password= skysql monitor_interval=1000 -allow_cluster_recovery=true detect_standalone_master=true auto_failover=false auto_rejoin=true 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 ba966aeac..4ac64d919 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 @@ -8,7 +8,6 @@ servers= server1, server2, server3, server4 user=maxskysql password= skysql monitor_interval=1000 -allow_cluster_recovery=true detect_standalone_master=true auto_failover=true auto_rejoin=false 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 5050a38c3..f2589a1b1 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_stress +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_stress @@ -8,7 +8,6 @@ servers=server1, server2, server3, server4 user=maxskysql password=skysql monitor_interval=1000 -allow_cluster_recovery=true detect_standalone_master=true auto_failover=false auto_rejoin=false diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.proxy_protocol b/maxscale-system-test/cnf/maxscale.cnf.template.proxy_protocol index 93cc4e995..9f3217961 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.proxy_protocol +++ b/maxscale-system-test/cnf/maxscale.cnf.template.proxy_protocol @@ -10,7 +10,6 @@ password= skysql monitor_interval=1000 detect_standalone_master=true failcount=1 -allow_cluster_recovery=true [RW-Split-Router] type=service