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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2019-01-03 09:21:47 +02:00
parent 35d31801bb 8f0e4a3034
commit 26da72a41f
14 changed files with 235 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
maxscale-system-test/sysbench_example.cpp
View File

@ -21,7 +21,7 @@ int main(int argc, char* argv[])
fflush(stdout);
Test->tprintf("Connecting to RWSplit %s\n", Test->maxscales->IP[0]);
sprintf(&sys1[0], sysbench_prepare_short, Test->sysbench_dir, Test->sysbench_dir, Test->maxscales->IP[0]);
sprintf(&sys1[0], SYSBENCH_PREPARE_SHORT, Test->maxscales->IP[0]);
Test->tprintf("Preparing sysbench tables\n%s\n", sys1);
Test->set_timeout(10000);
@ -29,13 +29,8 @@ int main(int argc, char* argv[])
Test->stop_timeout();
sprintf(&sys1[0],
sysbench_command_short,
Test->sysbench_dir,
Test->sysbench_dir,
Test->maxscales->IP[0],
Test->maxscales->rwsplit_port[0],
"off");
sprintf(&sys1[0], SYSBENCH_COMMAND_SHORT, Test->maxscales->IP[0],
Test->maxscales->rwsplit_port[0]);
Test->set_log_copy_interval(300);
Test->tprintf("Executing sysbench \n%s\n", sys1);
if (system(sys1) != 0)
@ -48,15 +43,17 @@ int main(int argc, char* argv[])
printf("Dropping sysbanch tables!\n");
fflush(stdout);
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "DROP TABLE sbtest1");
if (!Test->smoke)
{
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "DROP TABLE sbtest2");
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "DROP TABLE sbtest3");
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "DROP TABLE sbtest4");
}
/*
* Test->try_query(Test->maxscales->conn_rwsplit[0], (char *) "DROP TABLE sbtest1");
* if (!Test->smoke)
* {
* Test->try_query(Test->maxscales->conn_rwsplit[0], (char *) "DROP TABLE sbtest2");
* Test->try_query(Test->maxscales->conn_rwsplit[0], (char *) "DROP TABLE sbtest3");
* Test->try_query(Test->maxscales->conn_rwsplit[0], (char *) "DROP TABLE sbtest4");
* }
*/
// global_result += execute_query(Test->maxscales->conn_rwsplit[0], (char *) "DROP TABLE sbtest");
Test->global_result += execute_query(Test->maxscales->conn_rwsplit[0], (char*) "DROP TABLE sbtest1");
printf("closing connections to MaxScale!\n");
fflush(stdout);