Merge branch '2.4' into develop

Author: markus456

.gitignore

@@ -65,3 +65,11 @@ CLion project files
 *.pro
 *.pro.user
 *.pri
+
+# Build directories
+/debug*/
+/release*/
+/package*/
+
+# Emacs
+TAGS

maxscale-system-test/ccrfilter_global.cpp

@@ -18,7 +18,7 @@ int main(int argc, char* argv[])
     auto secondary = test.maxscales->rwsplit();
     secondary.connect();
 
-    for (int i = 0; i < 50; i++)
+    for (int i = 0; i < 25; i++)
     {
         conn.connect();
         test.expect(conn.query("INSERT INTO test.t1 VALUES ('" + data + "')"),
@@ -34,6 +34,9 @@ int main(int argc, char* argv[])
         // Existing connections should also see the inserted rows
         auto second_count = std::stoi(secondary.field("SELECT COUNT(*) FROM test.t1"));
         test.expect(second_count == i + 1, "Missing `%d` rows from open connection.", (i + 1) - count);
+
+        // Make sure the row is replicated before inserting another one
+        test.repl->sync_slaves();
     }
 
     conn.connect();

maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter_global

@@ -17,7 +17,7 @@ monitor_interval=1000
 [ccrfilter]
 type=filter
 module=ccrfilter
-time=5
+time=10
 global=true
 
 # RWSplit

server/modules/routing/readconnroute/readconnroute.hh

@@ -49,6 +49,7 @@ public:
 
     bool handleError(mxs::ErrorType type, GWBUF* pMessage, mxs::Endpoint* pProblem, const mxs::Reply& pReply)
     {
+        MXS_INFO("Server '%s' failed", pProblem->target()->name());
         return false;
     }