Do minor improvements to monitor tests

The mm test was on the heavy side and the workload can be reduced for the
sake of testing only the functionality.

The mm_mysqlmon test did not check the initial state of the
server. Although not necessary, adding it will help detect test failures
caused by broken replication.

mxs1457_ignore_deleted did not stop the monitors before breaking the
replication and attempting to use MaxScale. As the test expects
authentication to work regardless of the actual state of the servers, the
monitors need to be disabled before a query is attempted.

maxscale-system-test/mm.cpp

@@ -34,12 +34,12 @@ int check_conf(TestConnections* Test, int blocked_node)
     Test->repl->connect();
     Test->connect_rwsplit();
     create_t1(Test->conn_rwsplit);
-    global_result += insert_into_t1(Test->conn_rwsplit, 4);
+    global_result += insert_into_t1(Test->conn_rwsplit, 3);
 
     printf("Sleeping to let replication happen\n");
     fflush(stdout);
     Test->stop_timeout();
-    sleep(30);
+    sleep(15);
 
     for (int i = 0; i < 2; i++)
     {
@@ -47,13 +47,13 @@ int check_conf(TestConnections* Test, int blocked_node)
         {
             Test->tprintf("Checking data from node %d (%s)\n", i, Test->repl->IP[i]);
             Test->set_timeout(100);
-            global_result += select_from_t1(Test->repl->nodes[i], 4);
+            global_result += select_from_t1(Test->repl->nodes[i], 3);
         }
     }
     Test->set_timeout(100);
     printf("Checking data from rwsplit\n");
     fflush(stdout);
-    global_result += select_from_t1(Test->conn_rwsplit, 4);
+    global_result += select_from_t1(Test->conn_rwsplit, 3);
     global_result += execute_query(Test->conn_rwsplit, "DROP TABLE t1");
 
     Test->repl->close_connections();
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
     Test->tprintf("Block slave\n");
     Test->repl->block_node(0);
     Test->stop_timeout();
-    sleep(15);
+    sleep(10);
     Test->set_timeout(120);
     Test->get_maxadmin_param((char *) "show server server1", (char *) "Status:", maxadmin_result);
     printf("node0 %s\n", maxadmin_result);
@@ -110,12 +110,12 @@ int main(int argc, char *argv[])
     Test->set_timeout(120);
     Test->tprintf("Unlock slave\n");
     Test->repl->unblock_node(0);
-    sleep(15);
+    sleep(10);
 
     Test->set_timeout(120);
     Test->tprintf("Block master\n");
     Test->repl->block_node(1);
-    sleep(15);
+    sleep(10);
     Test->get_maxadmin_param((char *) "show server server2", (char *) "Status:", maxadmin_result);
     printf("node1 %s\n", maxadmin_result);
     if (strstr(maxadmin_result, "Down")  == NULL )
@@ -129,21 +129,21 @@ int main(int argc, char *argv[])
     execute_query(Test->repl->nodes[0], (char *) "SET GLOBAL READ_ONLY=OFF");
     Test->repl->close_connections();
 
-    sleep(15);
+    sleep(10);
     Test->set_timeout(120);
     Test->tprintf("Put some data and check\n");
     Test->add_result(check_conf(Test, 1), "configuration broken\n");
 
     printf("Unlock slave\n");
     Test->repl->unblock_node(1);
-    sleep(15);
+    sleep(10);
 
     Test->set_timeout(120);
     printf("Make node 2 slave\n");
     Test->repl->connect();
     execute_query(Test->repl->nodes[1], (char *) "SET GLOBAL READ_ONLY=ON");
     Test->repl->close_connections();
-    sleep(15);
+    sleep(10);
 
     Test->set_timeout(120);
     printf("Put some data and check\n");

maxscale-system-test/mm_mysqlmon.cpp

@@ -92,6 +92,12 @@ int main(int argc, char *argv[])
 {
     TestConnections * Test = new TestConnections(argc, argv);
 
+    Test->tprintf("Checking initial state of the servers");
+    check_status(Test, "server1", "Master, Running");
+    check_status(Test, "server2", "Slave, Running");
+    check_status(Test, "server3", "Slave, Running");
+    check_status(Test, "server4", "Slave, Running");
+
     Test->tprintf("Test 1 - Configure all servers into a multi-master ring with one slave");
 
     Test->set_timeout(120);

maxscale-system-test/mxs1457_ignore_deleted.cpp

@@ -17,6 +17,11 @@ int main(int argc, char *argv[])
     test.repl->sync_slaves();
     test.repl->close_connections();
 
+    /**
+     * The monitor needs to be stopped before the slaves are stopped to prevent
+     * it from detecting the broken replication.
+     */
+    test.ssh_maxscale(true, "maxadmin shutdown monitor \"MySQL Monitor\"");
     // Stop slaves and drop the user on the master
     test.repl->stop_slaves();
     test.repl->connect();