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

Wait two monitor intervals in mysqlmon_failover_auto

Browse Source 
The master failover require two monitor intervals to complete.
This commit is contained in:
Markus Mäkelä
2018-09-12 14:02:48 +03:00
parent 6f5d089131
commit b3e2bf58d9
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/mysqlmon_failover_auto.cpp
View File

@ -21,13 +21,13 @@ int main(int argc, char** argv)
test.repl->connect(); test.repl->connect();
delete_slave_binlogs(test); delete_slave_binlogs(test);
test.maxscales->wait_for_monitor(); test.maxscales->wait_for_monitor(2);
basic_test(test); basic_test(test);
print_gtids(test); print_gtids(test);
// Part 1 // Part 1
int node0_id = prepare_test_1(test); int node0_id = prepare_test_1(test);
test.maxscales->wait_for_monitor(); test.maxscales->wait_for_monitor(2);
check_test_1(test, node0_id); check_test_1(test, node0_id);
if (test.global_result != 0) if (test.global_result != 0)
@ -37,7 +37,7 @@ int main(int argc, char** argv)
// Part 2 // Part 2
prepare_test_2(test); prepare_test_2(test);
test.maxscales->wait_for_monitor(); test.maxscales->wait_for_monitor(2);
check_test_2(test); check_test_2(test);
if (test.global_result != 0) if (test.global_result != 0)
@ -47,7 +47,7 @@ int main(int argc, char** argv)
// Part 3 // Part 3
prepare_test_3(test); prepare_test_3(test);
test.maxscales->wait_for_monitor(); test.maxscales->wait_for_monitor(2);
check_test_3(test); check_test_3(test);
return test.global_result; return test.global_result;