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

Simplify mxs431

Browse Source 
The test unnecessarily restarted MaxScale for no obvious reason. Cleaned
up SQL queries to use new functionality.
This commit is contained in:
Markus Mäkelä
2018-01-31 11:03:17 +02:00
parent 12f5cabc50
commit 8ebac86406
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
maxscale-system-test/mxs431.cpp
View File

@ -10,37 +10,26 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
TestConnections test(argc, argv); TestConnections test(argc, argv);
char str[256];
int iterations = 100;
test.repl->execute_query_all_nodes((char *) "set global max_connections = 600;");
test.set_timeout(200);
test.repl->stop_slaves();
test.set_timeout(200);
test.maxscales->restart_maxscale(0);
test.set_timeout(200);
test.repl->connect(); test.repl->connect();
test.stop_timeout();
/** Create a database on each node */ /** Create a database on each node */
for (int i = 0; i < test.repl->N; i++) for (int i = 0; i < test.repl->N; i++)
{ {
test.set_timeout(20); test.set_timeout(20);
sprintf(str, "DROP DATABASE IF EXISTS shard_db%d", i); execute_query(test.repl->nodes[i], "set global max_connections = 600");
test.tprintf("%s\n", str); execute_query(test.repl->nodes[i], "DROP DATABASE IF EXISTS shard_db%d", i);
execute_query(test.repl->nodes[i], str); execute_query(test.repl->nodes[i], "CREATE DATABASE shard_db%d", i);
test.set_timeout(20);
sprintf(str, "CREATE DATABASE shard_db%d", i);
test.tprintf("%s\n", str);
execute_query(test.repl->nodes[i], str);
test.stop_timeout(); test.stop_timeout();
} }
test.repl->close_connections(); int iterations = 100;
for (int j = 0; j < iterations && test.global_result == 0; j++) for (int j = 0; j < iterations && test.global_result == 0; j++)
{ {
for (int i = 0; i < test.repl->N && test.global_result == 0; i++) for (int i = 0; i < test.repl->N && test.global_result == 0; i++)
{ {
char str[256];
sprintf(str, "shard_db%d", i); sprintf(str, "shard_db%d", i);
test.set_timeout(30); test.set_timeout(30);
MYSQL *conn = open_conn_db(test.maxscales->rwsplit_port[0], test.maxscales->IP[0], MYSQL *conn = open_conn_db(test.maxscales->rwsplit_port[0], test.maxscales->IP[0],
@ -52,5 +41,13 @@ int main(int argc, char *argv[])
} }
} }
/** Create a database on each node */
for (int i = 0; i < test.repl->N; i++)
{
test.set_timeout(20);
execute_query(test.repl->nodes[i], "DROP DATABASE shard_db%d", i);
test.stop_timeout();
}
return test.global_result; return test.global_result;
} }