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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-04-23 12:05:18 +03:00
parent 9e3f0aab5a ba79028a46
commit 4186f39616
26 changed files with 134 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ user=maxskysql
password= skysql
detect_stale_master=0
monitor_interval=1000
assume_unique_hostnames=false
[RW-Split-Router]
type=service
@ -18,6 +19,7 @@ servers=server1, server2, server3, server4
user=maxskysql
password=skysql
slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
max_slave_replication_lag=1
[Read-Connection-Router-Slave]
type=service

8
maxscale-system-test/mdbci/cnf/galera_server1.cnf
View File

@ -7,7 +7,7 @@ wsrep_on=ON
# Row binary log format is required by Galera
binlog_format=ROW
log-bin
log-bin=mar-bin
# InnoDB is currently the only storage engine supported by Galera
default-storage-engine=innodb
@ -16,9 +16,6 @@ innodb_file_per_table
# To avoid issues with 'bulk mode inserts' using autoincrement fields
innodb_autoinc_lock_mode=2
# Required to prevent deadlocks on parallel transaction execution
innodb_locks_unsafe_for_binlog=1
# Query Cache is not supported by Galera wsrep replication
query_cache_size=0
query_cache_type=0
@ -87,9 +84,6 @@ wsrep_auto_increment_control=1
# Retry autoinc insert, when the insert failed for "duplicate key error"
wsrep_drupal_282555_workaround=0
# Enable "strictly synchronous" semantics for read operations
wsrep_causal_reads=1
# Command to call when node status or cluster membership changes.
# Will be passed all or some of the following options:
# --status - new status of this node

8
maxscale-system-test/mdbci/cnf/galera_server2.cnf
View File

@ -7,7 +7,7 @@ wsrep_on=ON
# Row binary log format is required by Galera
binlog_format=ROW
log-bin
log-bin=mar-bin
# InnoDB is currently the only storage engine supported by Galera
default-storage-engine=innodb
@ -16,9 +16,6 @@ innodb_file_per_table
# To avoid issues with 'bulk mode inserts' using autoincrement fields
innodb_autoinc_lock_mode=2
# Required to prevent deadlocks on parallel transaction execution
innodb_locks_unsafe_for_binlog=1
# Query Cache is not supported by Galera wsrep replication
query_cache_size=0
query_cache_type=0
@ -87,9 +84,6 @@ wsrep_auto_increment_control=1
# Retry autoinc insert, when the insert failed for "duplicate key error"
wsrep_drupal_282555_workaround=0
# Enable "strictly synchronous" semantics for read operations
wsrep_causal_reads=1
# Command to call when node status or cluster membership changes.
# Will be passed all or some of the following options:
# --status - new status of this node

8
maxscale-system-test/mdbci/cnf/galera_server3.cnf
View File

@ -7,7 +7,7 @@ wsrep_on=ON
# Row binary log format is required by Galera
binlog_format=ROW
log-bin
log-bin=mar-bin
# InnoDB is currently the only storage engine supported by Galera
default-storage-engine=innodb
@ -16,9 +16,6 @@ innodb_file_per_table
# To avoid issues with 'bulk mode inserts' using autoincrement fields
innodb_autoinc_lock_mode=2
# Required to prevent deadlocks on parallel transaction execution
innodb_locks_unsafe_for_binlog=1
# Query Cache is not supported by Galera wsrep replication
query_cache_size=0
query_cache_type=0
@ -87,9 +84,6 @@ wsrep_auto_increment_control=1
# Retry autoinc insert, when the insert failed for "duplicate key error"
wsrep_drupal_282555_workaround=0
# Enable "strictly synchronous" semantics for read operations
wsrep_causal_reads=1
# Command to call when node status or cluster membership changes.
# Will be passed all or some of the following options:
# --status - new status of this node

8
maxscale-system-test/mdbci/cnf/galera_server4.cnf
View File

@ -7,7 +7,7 @@ wsrep_on=ON
# Row binary log format is required by Galera
binlog_format=ROW
log-bin
log-bin=mar-bin
# InnoDB is currently the only storage engine supported by Galera
default-storage-engine=innodb
@ -16,9 +16,6 @@ innodb_file_per_table
# To avoid issues with 'bulk mode inserts' using autoincrement fields
innodb_autoinc_lock_mode=2
# Required to prevent deadlocks on parallel transaction execution
innodb_locks_unsafe_for_binlog=1
# Query Cache is not supported by Galera wsrep replication
query_cache_size=0
query_cache_type=0
@ -87,9 +84,6 @@ wsrep_auto_increment_control=1
# Retry autoinc insert, when the insert failed for "duplicate key error"
wsrep_drupal_282555_workaround=0
# Enable "strictly synchronous" semantics for read operations
wsrep_causal_reads=1
# Command to call when node status or cluster membership changes.
# Will be passed all or some of the following options:
# --status - new status of this node

1
maxscale-system-test/mxs559_block_master.cpp
View File

@ -114,6 +114,7 @@ int main(int argc, char* argv[])
test.try_query(test.maxscales->conn_rwsplit[0], "DROP TABLE IF EXISTS t1");
test.maxscales->close_maxscale_connections(0);
test.maxscales->wait_for_monitor();
test.check_maxscale_alive(0);
test.log_excludes(0, "due to authentication failure");
test.log_excludes(0, "due to handshake failure");

5
maxscale-system-test/non_native_setup.cpp
View File

@ -26,10 +26,7 @@ int main(int argc, char* argv[])
std::string(" ") +
std::string(argv[1]);
int local_argc = argc - 1;
char** local_argv = &argv[1];
TestConnections test(local_argc, local_argv);
TestConnections test(argc, argv);
sleep(3);
setenv("src_dir", test_dir, 1);