Merge branch '2.3' into develop

maxscale-system-test/mysqlmon_rejoin_bad.cpp

@@ -11,41 +11,44 @@
  * Public License.
  */
 
+#include <iostream>
 #include <vector>
 
 #include "testconnections.h"
 #include "fail_switch_rejoin_common.cpp"
 
 using std::string;
+using std::cout;
 
 int main(int argc, char** argv)
 {
-    char result_tmp[bufsize];
     interactive = strcmp(argv[argc - 1], "interactive") == 0;
     Mariadb_nodes::require_gtid(true);
     TestConnections test(argc, argv);
-    MYSQL* maxconn = test.maxscales->open_rwsplit_connection(0);
+    test.repl->connect();
-
-    // Set up test table
-    basic_test(test);
     // Delete binlogs to sync gtid:s
     delete_slave_binlogs(test);
+    // Set up test table
+    basic_test(test);
     // Advance gtid:s a bit to so gtid variables are updated.
+    MYSQL* maxconn = test.maxscales->open_rwsplit_connection(0);
     generate_traffic_and_check(test, maxconn, 10);
     test.repl->sync_slaves(0);
 
     test.tprintf(LINE);
     print_gtids(test);
     test.tprintf(LINE);
+    char result_tmp[bufsize];
     string gtid_begin;
     if (find_field(maxconn, GTID_QUERY, GTID_FIELD, result_tmp) == 0)
     {
         gtid_begin = result_tmp;
     }
     mysql_close(maxconn);
+
     test.tprintf("Stopping MaxScale...");
     // Mess with the slaves to fix situation such that only one slave can be rejoined. Stop maxscale.
-    if (test.stop_maxscale(0))
+    if (test.stop_maxscale(0) != 0)
     {
         test.expect(false, "Could not stop MaxScale.");
         return test.global_result;
@@ -55,22 +58,21 @@ int main(int argc, char** argv)
     const char STOP_SLAVE[] = "STOP SLAVE;";
     const char RESET_SLAVE[] = "RESET SLAVE ALL;";
     const char READ_ONLY_OFF[] = "SET GLOBAL read_only=0;";
-    test.repl->connect();
+
     const int FIRST_MOD_NODE = 2;   // Modify nodes 2 & 3
     const int NODE_COUNT = test.repl->N;
     MYSQL** nodes = test.repl->nodes;
-
     for (int i = FIRST_MOD_NODE; i < NODE_COUNT; i++)
     {
-        if (mysql_query(nodes[i], STOP_SLAVE) != 0
+        if ((mysql_query(nodes[i], STOP_SLAVE) != 0) || (mysql_query(nodes[i], RESET_SLAVE) != 0)
-            || mysql_query(nodes[i], RESET_SLAVE) != 0
+            || (mysql_query(nodes[i], READ_ONLY_OFF) != 0))
-            || mysql_query(nodes[i], READ_ONLY_OFF) != 0)
         {
             test.expect(false, "Could not stop slave connections and/or disable read_only for node %d.", i);
-            return test.global_result;
         }
     }
 
+    if (test.ok())
+    {
         // Add more events to node3.
         string gtid_node2, gtid_node3;
         test.tprintf("Sending more inserts to server 4.");
@@ -87,39 +89,41 @@ int main(int argc, char** argv)
         print_gtids(test);
         bool gtids_ok = (gtid_begin == gtid_node2 && gtid_node2 < gtid_node3);
         test.expect(gtids_ok, "Gtid:s have not advanced correctly.");
-    if (!gtids_ok)
-    {
-        return test.global_result;
     }
+
+
     test.tprintf("Restarting MaxScale. Server 4 should not rejoin the cluster.");
     test.tprintf(LINE);
-    if (test.start_maxscale(0))
+    if (test.start_maxscale(0) != 0)
     {
         test.expect(false, "Could not start MaxScale.");
         return test.global_result;
     }
-    test.maxscales->wait_for_monitor();
+    test.maxscales->wait_for_monitor(2);
     get_output(test);
 
+    if (test.ok())
+    {
         StringSet node2_states = test.get_server_status("server3");
         StringSet node3_states = test.get_server_status("server4");
         bool states_n2_ok = (node2_states.find("Slave") != node2_states.end());
         bool states_n3_ok = (node3_states.find("Slave") == node3_states.end());
         test.expect(states_n2_ok, "Node 2 has not rejoined when it should have.");
         test.expect(states_n3_ok, "Node 3 rejoined when it shouldn't have.");
-    if (!states_n2_ok || !states_n3_ok)
-    {
-        return test.global_result;
     }
+
+    if (test.ok())
+    {
         // Finally, fix replication by telling the current master to replicate from server4
-    test.tprintf("Setting server 1 to replicate from server 4. Auto-rejoin should redirect servers 2 and 3.");
+        test.tprintf(
+            "Setting server 1 to replicate from server 4. Auto-rejoin should redirect servers 2 and 3.");
         const char CHANGE_CMD_FMT[] = "CHANGE MASTER TO MASTER_HOST = '%s', MASTER_PORT = %d, "
                                       "MASTER_USE_GTID = current_pos, MASTER_USER='repl', MASTER_PASSWORD = 'repl';";
-    char cmd[256];
+        char change_cmd[256];
-    snprintf(cmd, sizeof(cmd), CHANGE_CMD_FMT, test.repl->IP[3], test.repl->port[3]);
+        snprintf(change_cmd, sizeof(change_cmd), CHANGE_CMD_FMT, test.repl->IP[3], test.repl->port[3]);
-    mysql_query(nodes[0], cmd);
+        test.try_query(nodes[0], "%s", change_cmd);
-    mysql_query(nodes[0], "START SLAVE;");
+        test.try_query(nodes[0], "START SLAVE;");
-    test.maxscales->wait_for_monitor();
+        test.maxscales->wait_for_monitor(2);
         get_output(test);
         int master_id = get_master_server_id(test);
         test.expect(master_id == 4, "Server 4 should be the cluster master.");
@@ -127,19 +131,14 @@ int main(int argc, char** argv)
         bool states_n0_ok = (node0_states.find("Slave") != node0_states.end()
                              && node0_states.find("Relay Master") == node0_states.end());
         test.expect(states_n0_ok, "Server 1 is not a slave when it should be.");
-    if (states_n0_ok)
-    {
-        int ec;
-        test.maxscales->ssh_node_output(0,
-                                        "maxadmin call command mysqlmon switchover MySQL-Monitor server1 server4",
-                                        true,
-                                        &ec);
-        test.maxscales->wait_for_monitor();
-        master_id = get_master_server_id(test);
-        test.expect(master_id == 1, "Server 1 should be the cluster master.");
-        get_output(test);
     }
 
-    test.repl->fix_replication();
+    cout << "Reseting cluster...\n";
+    int ec;
+    string reset_cmd = "maxadmin call command mysqlmon reset-replication MySQL-Monitor server1";
+    test.maxscales->ssh_node_output(0, reset_cmd.c_str(), true, &ec);
+    test.maxscales->wait_for_monitor(1);
+    test.expect(get_master_server_id(test) == 1, "server1 is not the master when it should. "
+                                                 "reset-replication must have failed.");
     return test.global_result;
 }

maxscale-system-test/mysqlmon_switchover_auto.cpp

@@ -47,6 +47,7 @@ int main(int argc, char** argv)
         cout << "Disks-plugin installed and gtid_strict_mode enabled on all servers. "
                 "Starting MaxScale.\n";
         test.start_maxscale();
+        test.maxscales->wait_for_monitor(1);
         disks_plugin_loaded = true;
     }
     else