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

Remove unnecessary sleeps from tests

Browse Source 
Removed unnecessary sleeps and replaced sleeps with wait_for_monitor in
some older tests. Also removed the odd arrangement of arrays in
server_weight.
This commit is contained in:
Markus Mäkelä
2018-11-18 22:39:41 +02:00
parent 47092ed18a
commit fd3a42ceb6
4 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
maxscale-system-test/server_weight.cpp
View File

@ -30,7 +30,7 @@ int main(int argc, char* argv[])
{
int maxscale_conn_num = 60;
MYSQL* conn_read[maxscale_conn_num];
MYSQL* conn_rwsplit[0][maxscale_conn_num];
MYSQL* conn_rwsplit[maxscale_conn_num];
TestConnections test(argc, argv);
test.set_timeout(30);
int i;
@ -40,13 +40,12 @@ int main(int argc, char* argv[])
test.tprintf("Connecting to ReadConnMaster on %s\n", test.maxscales->IP[0]);
for (i = 0; i < maxscale_conn_num; i++)
{
// Open the connection and perform a query on it. This way we know it'll
// be fully established when we count the connections.
conn_read[i] = test.maxscales->open_readconn_master_connection(0);
test.try_query(conn_read[i], "SELECT 1");
}
test.stop_timeout();
test.tprintf("Sleeping 15 seconds\n");
sleep(15);
int Nc[4];
Nc[0] = maxscale_conn_num / 6;
@ -62,21 +61,14 @@ int main(int argc, char* argv[])
mysql_close(conn_read[i]);
}
test.stop_timeout();
test.tprintf("Sleeping 15 seconds\n");
sleep(15);
test.set_timeout(30);
test.tprintf("Connecting to RWSplit on %s\n", test.maxscales->IP[0]);
for (i = 0; i < maxscale_conn_num; i++)
{
conn_rwsplit[0][i] = test.maxscales->open_rwsplit_connection(0);
conn_rwsplit[i] = test.maxscales->open_rwsplit_connection(0);
test.try_query(conn_rwsplit[i], "SELECT 1");
}
test.stop_timeout();
test.tprintf("Sleeping 15 seconds\n");
sleep(15);
Nc[1] = maxscale_conn_num / 2;
Nc[2] = maxscale_conn_num / 3;
Nc[3] = maxscale_conn_num / 6;
@ -88,7 +80,7 @@ int main(int argc, char* argv[])
for (i = 0; i < maxscale_conn_num; i++)
{
mysql_close(conn_rwsplit[0][i]);
mysql_close(conn_rwsplit[i]);
}
test.repl->close_connections();