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

MXS-1643: Only test existence of extra events mxs1643_extra_events

Browse Source 
Don't test failover functionality when it is not needed. The bug is only
about the extra events that appear when a master is demoted and a slave is
promoted.
This commit is contained in:
Markus Mäkelä
2018-06-27 10:49:32 +03:00
parent b7fdaf0340
commit a6182d48bf
2 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maxscale-system-test/cnf/maxscale.cnf.template.mxs1643_extra_events
View File

@ -8,16 +8,6 @@ servers= server1,server2,server3,server4
user=maxskysql user=maxskysql
passwd= skysql passwd= skysql
monitor_interval=1000 monitor_interval=1000
detect_standalone_master=true
failcount=1
allow_cluster_recovery=true
replication_user=repl
replication_password=repl
backend_connect_timeout=3
backend_read_timeout=3
backend_write_timeout=3
auto_failover=true
auto_rejoin=true
[RW Split Router] [RW Split Router]
type=service type=service

11
maxscale-system-test/mxs1643_extra_events.cpp
View File

@ -7,7 +7,6 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
Mariadb_nodes::require_gtid(true);
TestConnections test(argc, argv); TestConnections test(argc, argv);
// Check that master gets the slave status when set into read-only mode // Check that master gets the slave status when set into read-only mode
@ -18,22 +17,14 @@ int main(int argc, char** argv)
test.tprintf("Check that the current master now has the slave label"); test.tprintf("Check that the current master now has the slave label");
test.check_log_err(0, "[Master, Running] -> [Running]", false); test.check_log_err(0, "[Master, Running] -> [Running]", false);
test.check_log_err(0, "[Master, Running] -> [Slave, Running]", true); test.check_log_err(0, "[Master, Running] -> [Slave, Running]", true);
execute_query(test.repl->nodes[0], "SET GLOBAL read_only=OFF");
test.maxscales->wait_for_monitor();
test.maxscales->ssh_node_f(0, true, "truncate -s 0 /var/log/maxscale/maxscale.log"); test.maxscales->ssh_node_f(0, true, "truncate -s 0 /var/log/maxscale/maxscale.log");
// Check that the Master and Slave status aren't both set // Check that the Master and Slave status aren't both set
test.tprintf("Block master and wait for monitor to detect it."); execute_query(test.repl->nodes[0], "SET GLOBAL read_only=OFF");
test.repl->block_node(0);
test.maxscales->wait_for_monitor(); test.maxscales->wait_for_monitor();
test.tprintf("Check that the new master doesn't have both slave and master labels"); test.tprintf("Check that the new master doesn't have both slave and master labels");
test.check_log_err(0, "[Slave, Running] -> [Master, Slave, Running]", false); test.check_log_err(0, "[Slave, Running] -> [Master, Slave, Running]", false);
test.check_log_err(0, "[Slave, Running] -> [Master, Running]", true); test.check_log_err(0, "[Slave, Running] -> [Master, Running]", true);
test.repl->unblock_node(0);
test.tprintf("Cleanup");
test.repl->execute_query_all_nodes( "STOP ALL SLAVES; RESET SLAVE ALL;");
test.repl->fix_replication();
return test.global_result; return test.global_result;
} }