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

Wait two monitor intervals in failover tests

Browse Source 
Since the failover always takes two intervals, the test also needs to wait
two intervals.
This commit is contained in:
Markus Mäkelä
2018-08-28 08:39:38 +03:00
parent a50e8e9ce6
commit 51ade9e6fe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxscale-system-test/failover_common.cpp
View File

@ -24,13 +24,13 @@ void reset_replication(TestConnections& test)
{ {
int ind = master_id - 1; int ind = master_id - 1;
replicate_from(test, 0, ind); replicate_from(test, 0, ind);
test.maxscales->wait_for_monitor(); test.maxscales->wait_for_monitor(2);
get_output(test); get_output(test);
int ec; int ec;
stringstream switchover; stringstream switchover;
switchover << "maxadmin call command mysqlmon switchover MySQL-Monitor server1 server" << master_id; switchover << "maxadmin call command mysqlmon switchover MySQL-Monitor server1 server" << master_id;
test.maxscales->ssh_node_output(0, switchover.str().c_str() , true, &ec); test.maxscales->ssh_node_output(0, switchover.str().c_str() , true, &ec);
test.maxscales->wait_for_monitor(); test.maxscales->wait_for_monitor(2);
master_id = get_master_server_id(test); master_id = get_master_server_id(test);
cout << "Master server id is now back to " << master_id << endl; cout << "Master server id is now back to " << master_id << endl;
test.assert(master_id == 1, "Switchover back to server1 failed"); test.assert(master_id == 1, "Switchover back to server1 failed");
@ -106,7 +106,7 @@ void check_test_2(TestConnections& test)
// Reset state // Reset state
replicate_from(test, 1, master_id - 1); replicate_from(test, 1, master_id - 1);
test.maxscales->wait_for_monitor(); test.maxscales->wait_for_monitor(2);
get_output(test); get_output(test);
StringSet node_states = test.get_server_status("server2"); StringSet node_states = test.get_server_status("server2");
test.assert(node_states.find("Slave") != node_states.end(), "Server 2 is not replicating."); test.assert(node_states.find("Slave") != node_states.end(), "Server 2 is not replicating.");
@ -143,7 +143,7 @@ void prepare_test_3(TestConnections& test)
test.repl->start_node(2, (char *) ""); test.repl->start_node(2, (char *) "");
test.repl->start_node(3, (char *) ""); test.repl->start_node(3, (char *) "");
test.maxscales->start_maxscale(0); test.maxscales->start_maxscale(0);
test.maxscales->wait_for_monitor(); test.maxscales->wait_for_monitor(2);
test.repl->connect(); test.repl->connect();
test.tprintf("Settings changed."); test.tprintf("Settings changed.");