From cab827b0a48ef03b3c0d2f93fcbdbde59178b1ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Mon, 5 Mar 2018 11:30:18 +0200 Subject: [PATCH] Fix replication after failover_mysqlmon When the test finishes and is about to check whether MaxScale is alive, the servers should be cleared from maintenance mode and the replication should be fixed. This way the test will clean up after itself. --- maxscale-system-test/failover_mysqlmon.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maxscale-system-test/failover_mysqlmon.cpp b/maxscale-system-test/failover_mysqlmon.cpp index 52f2a9ed1..570609ada 100644 --- a/maxscale-system-test/failover_mysqlmon.cpp +++ b/maxscale-system-test/failover_mysqlmon.cpp @@ -62,6 +62,11 @@ int main(int argc, char *argv[]) "@@server_id is different: %s != %s", maxscale_id, real_id); test->close_maxscale_connections(); + test->ssh_maxscale(true, "maxadmin clear server server1 maintenance"); + test->ssh_maxscale(true, "maxadmin clear server server2 maintenance"); + test->ssh_maxscale(true, "maxadmin clear server server3 maintenance"); + test->repl->fix_replication(); + test->tprintf(" Check that MaxScale is running "); test->check_maxscale_alive();