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

Use normal config for bug681

Browse Source 
The test doesn't require Galera backends.
This commit is contained in:
Markus Mäkelä
2018-11-02 17:36:02 +02:00
parent df003a3e7c
commit 70dfb447a2
2 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxscale-system-test/CMakeLists.txt
View File

@ -98,7 +98,7 @@ add_test_executable(bug529.cpp bug529 replication LABELS readwritesplit readconn
add_test_executable(bug547.cpp bug547 replication LABELS readwritesplit REPL_BACKEND) add_test_executable(bug547.cpp bug547 replication LABELS readwritesplit REPL_BACKEND)
# Regression case for the bug "crash if max_slave_connections=10% and 4 or less backends are configured" # Regression case for the bug "crash if max_slave_connections=10% and 4 or less backends are configured"
add_test_executable(bug681.cpp bug681 galera.bug681 LABELS readwritesplit GALERA_BACKEND) add_test_executable(bug681.cpp bug681 bug681 LABELS readwritesplit REPL_BACKEND)
# Regression case for the bug "crash with tee filter" # Regression case for the bug "crash with tee filter"
#add_test_executable(bug643.cpp bug643 bug643 LABELS tee REPL_BACKEND) #add_test_executable(bug643.cpp bug643 bug643 LABELS tee REPL_BACKEND)

35
maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681 → maxscale-system-test/cnf/maxscale.cnf.template.bug681 Executable file → Normal file
View File

@ -1,39 +1,29 @@
[maxscale] [maxscale]
threads=1 threads=1
log_warning=1
[MySQL Monitor] [MySQL Monitor]
type=monitor type=monitor
module=galeramon module=mariadbmon
servers=server1,server2,server3 servers=server1,server2,server3
#user=maxmon
#password=maxpwd
user=maxskysql user=maxskysql
password=skysql password=skysql
root_node_as_master=false
[RW Split Router] [RW Split Router]
type=service type=service
router=readwritesplit router=readwritesplit
servers=server1,server2,server3 servers=server1,server2,server3
#user=maxpriv
#password=maxpwd
user=maxskysql user=maxskysql
password=skysql password=skysql
filters=MyLogFilter filters=MyLogFilter
version_string=MariaDBEC-10.0.14 version_string=MariaDBEC-10.0.14
localhost_match_wildcard_host=1 localhost_match_wildcard_host=1
max_slave_connections=10% max_slave_connections=10%
#max_slave_replication_lag=30
#slave_selection_criteria=LEAST_BEHIND_MASTER
[Read Connection Router] [Read Connection Router]
type=service type=service
router=readconnroute router=readconnroute
router_options=synced router_options=master
servers=server1,server2,server3 servers=server1,server2,server3
#user=maxpriv
#password=maxpwd
user=maxskysql user=maxskysql
password=skysql password=skysql
@ -56,14 +46,12 @@ type=listener
service=RW Split Router service=RW Split Router
protocol=MySQLClient protocol=MySQLClient
port=4006 port=4006
#socket=/tmp/rwsplit.sock
[Read Connection Listener] [Read Connection Listener]
type=listener type=listener
service=Read Connection Router service=Read Connection Router
protocol=MySQLClient protocol=MySQLClient
port=4008 port=4008
#socket=/tmp/readconn.sock
[CLI] [CLI]
type=service type=service
@ -73,7 +61,6 @@ router=cli
type=listener type=listener
service=CLI service=CLI
protocol=maxscaled protocol=maxscaled
#address=localhost
socket=default socket=default
[MyLogFilter] [MyLogFilter]
@ -83,25 +70,19 @@ filebase=/tmp/QueryLog
[server1] [server1]
type=server type=server
address=###galera_server_IP_1### address=###node_server_IP_1###
port=###galera_server_port_1### port=###node_server_port_1###
protocol=MySQLBackend protocol=MySQLBackend
[server2] [server2]
type=server type=server
address=###galera_server_IP_2### address=###node_server_IP_2###
port=###galera_server_port_2### port=###node_server_port_2###
protocol=MySQLBackend protocol=MySQLBackend
[server3] [server3]
type=server type=server
address=###galera_server_IP_3### address=###node_server_IP_3###
port=###galera_server_port_3### port=###node_server_port_3###
protocol=MySQLBackend protocol=MySQLBackend
#[server4]
#type=server
#address=###galera_server_IP_4###
#port=###galera_server_port_4###
#protocol=MySQLBackend