Fix more galera test configurations

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 20f31428ac
commit ddc7b0fb09
5 changed files with 6 additions and 5 deletions

View File

@ -25,6 +25,7 @@ TestConnections * Test ;
int exit_flag;
int master = 0;
int i_trans = 0;
const int trans_max = 100;
int failed_transaction_num = 0;
/** 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));
create_t1(conn);
while ((exit_flag == 0))
while ((exit_flag == 0) && i_trans < trans_max)
{
Test->tprintf("Transaction %d\n", i_trans);
trans_result = transaction(conn, i_trans);

View File

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

View File

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

View File

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

View File

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