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

Fix mxs922_monitor

Browse Source 
The monitor needs to be unlinked from servers before it is destroyed.
This commit is contained in:
Markus Mäkelä
2020-04-15 10:23:33 +03:00
parent c689aac939
commit 87328228f8
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
maxscale-system-test/mxs922_monitor.cpp
View File

@ -16,10 +16,11 @@ int main(int argc, char* argv[])
config.create_monitor("mysql-monitor", "mysqlmon", 500); config.create_monitor("mysql-monitor", "mysqlmon", 500);
config.reset(); config.reset();
sleep(1); test->maxscales->wait_for_monitor();
test->check_maxscale_alive(0); test->check_maxscale_alive(0);
test->maxscales->ssh_node(0, "maxctrl unlink monitor mysql-monitor server{0,1,2,3}", true);
config.destroy_monitor("mysql-monitor"); config.destroy_monitor("mysql-monitor");
test->check_maxscale_alive(0); test->check_maxscale_alive(0);
@ -31,7 +32,7 @@ int main(int argc, char* argv[])
config.create_monitor("mysql-monitor2", "mysqlmon", 500); config.create_monitor("mysql-monitor2", "mysqlmon", 500);
config.add_created_servers("mysql-monitor2"); config.add_created_servers("mysql-monitor2");
sleep(1); test->maxscales->wait_for_monitor();
test->check_maxscale_alive(0); test->check_maxscale_alive(0);
/** Try to alter the monitor user */ /** Try to alter the monitor user */
@ -44,7 +45,7 @@ int main(int argc, char* argv[])
config.alter_monitor("mysql-monitor2", "user", "test"); config.alter_monitor("mysql-monitor2", "user", "test");
config.alter_monitor("mysql-monitor2", "password", "test"); config.alter_monitor("mysql-monitor2", "password", "test");
sleep(1); test->maxscales->wait_for_monitor();
test->check_maxscale_alive(0); test->check_maxscale_alive(0);
/** Remove the user */ /** Remove the user */
@ -60,7 +61,7 @@ int main(int argc, char* argv[])
*/ */
test->maxscales->ssh_node(0, "for i in 0 1 2 3; do maxadmin clear server server$i running; done", true); test->maxscales->ssh_node(0, "for i in 0 1 2 3; do maxadmin clear server server$i running; done", true);
sleep(1); test->maxscales->wait_for_monitor();
test->add_result(execute_query_silent(test->maxscales->conn_rwsplit[0], "SELECT 1") == 0, test->add_result(execute_query_silent(test->maxscales->conn_rwsplit[0], "SELECT 1") == 0,
"Query should fail when monitor has wrong credentials"); "Query should fail when monitor has wrong credentials");
test->maxscales->close_maxscale_connections(0); test->maxscales->close_maxscale_connections(0);