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

Fix more galera test configurations

Browse Source 
Some tests used galera options that aren't in 2.0 which caused the tests
to fail.

Also added an upper limit to some tests to reduce excessive execution
times.
This commit is contained in:
Markus Mäkelä
2017-05-30 11:48:11 +03:00
parent cca25376eb
commit a667ad90e5
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
maxscale-system-test/binlog_change_master.cpp
View File

@ -25,6 +25,7 @@ TestConnections * Test ;
int exit_flag; int exit_flag;
int master = 0; int master = 0;
int i_trans = 0; int i_trans = 0;
const int trans_max = 100;
int failed_transaction_num = 0; int failed_transaction_num = 0;
/** The amount of rows each transaction inserts */ /** The amount of rows each transaction inserts */
@ -294,7 +295,7 @@ void *transaction_thread( void *ptr )
Test->add_result(mysql_errno(conn), "Error connecting to Binlog router, error: %s\n", mysql_error(conn)); Test->add_result(mysql_errno(conn), "Error connecting to Binlog router, error: %s\n", mysql_error(conn));
create_t1(conn); create_t1(conn);
while ((exit_flag == 0)) while ((exit_flag == 0) && i_trans < trans_max)
{ {
Test->tprintf("Transaction %d\n", i_trans); Test->tprintf("Transaction %d\n", i_trans);
trans_result = transaction(conn, i_trans); trans_result = transaction(conn, i_trans);

2
maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt
View File

@ -10,7 +10,7 @@ servers= server1, server2,server3 ,server4
user=maxskysql user=maxskysql
passwd= skysql passwd= skysql
monitor_interval=1000 monitor_interval=1000
root_node_as_master=false #root_node_as_master=false
[RW Split Router] [RW Split Router]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs118
View File

@ -16,7 +16,7 @@ module=galeramon
servers= server1, server2,server3 ,server4 servers= server1, server2,server3 ,server4
user=maxskysql user=maxskysql
passwd= skysql passwd= skysql
root_node_as_master=false #root_node_as_master=false
[RW Split Router] [RW Split Router]
type=service type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs361
View File

@ -86,7 +86,7 @@ servers=gserver1,gserver2,gserver3,gserver4
user=maxskysql user=maxskysql
passwd=skysql passwd=skysql
monitor_interval=100 monitor_interval=100
root_node_as_master=false #root_node_as_master=false
[server1] [server1]
type=server type=server

2
maxscale-system-test/cnf/maxscale.cnf.template.pers_01
View File

@ -86,7 +86,7 @@ servers=gserver1,gserver2,gserver3,gserver4
user=maxskysql user=maxskysql
passwd=skysql passwd=skysql
monitor_interval=100 monitor_interval=100
root_node_as_master=false #root_node_as_master=false
[server1] [server1]
type=server type=server