From f2688784cf14d2474e90bcf127488760c300f0c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Sun, 11 Nov 2018 22:07:34 +0200 Subject: [PATCH] Reconnect before sync in mxs1743_rconn_bitmask The blocking of the nodes that happens before it could cause the connections to break. This also removes the need for the fixing of the replication which takes time. --- maxscale-system-test/mxs1743_rconn_bitmask.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/maxscale-system-test/mxs1743_rconn_bitmask.cpp b/maxscale-system-test/mxs1743_rconn_bitmask.cpp index f261eca33..032a9ecb5 100644 --- a/maxscale-system-test/mxs1743_rconn_bitmask.cpp +++ b/maxscale-system-test/mxs1743_rconn_bitmask.cpp @@ -44,13 +44,11 @@ int main(int argc, char** argv) test.try_query(test.repl->nodes[0], "%s", "CREATE USER 'mxs1743'@'%' IDENTIFIED BY 'mxs1743'"); test.try_query(test.repl->nodes[0], "%s", "GRANT ALL ON *.* TO 'mxs1743'@'%'"); - test.tprintf("Fix replication"); - test.set_timeout(60); - test.repl->fix_replication(); - test.set_timeout(120); test.tprintf("Syncing slaves"); + test.repl->connect(); test.repl->sync_slaves(); + test.repl->disconnect(); test.tprintf("Opening new connections to verify readconnroute works"); test.set_timeout(60); @@ -78,6 +76,7 @@ int main(int argc, char** argv) char master_connections[1024]; char slave_connections[1024]; test.set_timeout(60); + test.repl->connect(); find_field(test.repl->nodes[0], query.c_str(), "connections", master_connections); find_field(test.repl->nodes[1], query.c_str(), "connections", slave_connections);