From 37e64bad907ebaace45a0dd485480ab631833e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 27 Oct 2017 09:36:25 +0300 Subject: [PATCH] MXS-1493: Add master failure verification test --- maxscale-system-test/CMakeLists.txt | 4 ++ ...axscale.cnf.template.verify_master_failure | 60 +++++++++++++++++++ .../verify_master_failure.cpp | 25 ++++++++ 3 files changed, 89 insertions(+) create mode 100644 maxscale-system-test/cnf/maxscale.cnf.template.verify_master_failure create mode 100644 maxscale-system-test/verify_master_failure.cpp diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt index 8c3a53585..2252491c5 100644 --- a/maxscale-system-test/CMakeLists.txt +++ b/maxscale-system-test/CMakeLists.txt @@ -501,6 +501,10 @@ add_test_executable(mxs1451_skip_auth.cpp mxs1451_skip_auth mxs1451_skip_auth LA # https://jira.mariadb.org/browse/MXS-1457 add_test_executable(mxs1457_ignore_deleted.cpp mxs1457_ignore_deleted mxs1457_ignore_deleted LABELS REPL_BACKEND) +# MXS-1493: Use replication heartbeat in mysqlmon +# https://jira.mariadb.org/browse/MXS-1493 +add_test_executable(verify_master_failure.cpp verify_master_failure verify_master_failure LABELS REPL_BACKEND) + # 'namedserverfilter' test add_test_executable(namedserverfilter.cpp namedserverfilter namedserverfilter LABELS namedserverfilter LIGHT REPL_BACKEND) diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.verify_master_failure b/maxscale-system-test/cnf/maxscale.cnf.template.verify_master_failure new file mode 100644 index 000000000..f60710597 --- /dev/null +++ b/maxscale-system-test/cnf/maxscale.cnf.template.verify_master_failure @@ -0,0 +1,60 @@ +[maxscale] +threads=###threads### +log_info=1 + +[MySQL Monitor] +type=monitor +module=mysqlmon +###repl51### +servers=server1,server2,server3,server4 +user=maxskysql +passwd=skysql +monitor_interval=1000 +failover=true + +[RW Split Router] +type=service +router=readwritesplit +servers=server1,server2,server3,server4 +user=maxskysql +passwd=skysql + +[RW Split Listener] +type=listener +service=RW Split Router +protocol=MySQLClient +port=4006 + +[CLI] +type=service +router=cli + +[CLI Listener] +type=listener +service=CLI +protocol=maxscaled +socket=default + +[server1] +type=server +address=###node_server_IP_1### +port=###node_server_port_1### +protocol=MySQLBackend + +[server2] +type=server +address=###node_server_IP_2### +port=###node_server_port_2### +protocol=MySQLBackend + +[server3] +type=server +address=###node_server_IP_3### +port=###node_server_port_3### +protocol=MySQLBackend + +[server4] +type=server +address=###node_server_IP_4### +port=###node_server_port_4### +protocol=MySQLBackend diff --git a/maxscale-system-test/verify_master_failure.cpp b/maxscale-system-test/verify_master_failure.cpp new file mode 100644 index 000000000..4c961d113 --- /dev/null +++ b/maxscale-system-test/verify_master_failure.cpp @@ -0,0 +1,25 @@ +/** + * MXS-1493: https://jira.mariadb.org/browse/MXS-1493 + * + * Testing of master failure verification + */ + +#include "testconnections.h" + +int main(int argc, char *argv[]) +{ + TestConnections test(argc, argv); + + test.tprintf("Blocking master and checking that master failure is delayed at least once."); + test.repl->block_node(0); + sleep(5); + test.check_log_err("delaying failover", true); + + test.tprintf("Waiting to see if failover is performed."); + sleep(10); + test.check_log_err("Performing failover", true); + + // TODO: Extend the test + + return test.global_result; +}