From ca1db89994ac738b418f3dd46fdb270ee0294266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Mon, 26 Oct 2020 20:56:05 +0200 Subject: [PATCH 1/2] MXS-3259: Increase connection limits Lowering max_connections to 10 prevented the test system itself from connecting to it. The replication slaves count towards max_connections and with up to 15 connections in the test, the limit should be higher. --- system-test/backend_auth_fail.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/system-test/backend_auth_fail.cpp b/system-test/backend_auth_fail.cpp index 06db352f0..19376d252 100644 --- a/system-test/backend_auth_fail.cpp +++ b/system-test/backend_auth_fail.cpp @@ -11,7 +11,7 @@ int main(int argc, char** argv) MYSQL* mysql[1000]; TestConnections* Test = new TestConnections(argc, argv); - Test->repl->execute_query_all_nodes((char*) "set global max_connections = 10;"); + Test->repl->execute_query_all_nodes((char*) "set global max_connections = 30;"); for (int x = 0; x < 3; x++) { @@ -31,10 +31,6 @@ int main(int argc, char** argv) } } - // Wait for the connections to clean up - Test->stop_timeout(); - sleep(2 * Test->repl->N); - Test->check_maxscale_alive(0); int rval = Test->global_result; delete Test; From 46dab1e8841b81eb78d8c4ed39439ba2ad8c4984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 28 Oct 2020 13:16:21 +0200 Subject: [PATCH 2/2] MXS-3259: Add default connection timeout The connector never times out if one is not defined. This seems to help make the mxs1985_kill_hang test a lot more stable. --- system-test/maxtest/src/mariadb_func.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system-test/maxtest/src/mariadb_func.cc b/system-test/maxtest/src/mariadb_func.cc index 9c2cd4054..da136d7b4 100644 --- a/system-test/maxtest/src/mariadb_func.cc +++ b/system-test/maxtest/src/mariadb_func.cc @@ -50,6 +50,9 @@ MYSQL* open_conn_db_flags(int port, set_ssl(conn); } + unsigned int timeout = 15; + mysql_options(conn, MYSQL_OPT_CONNECT_TIMEOUT, &timeout); + // MXS-2568: This fixes mxs1828_double_local_infile mysql_optionsv(conn, MYSQL_OPT_LOCAL_INFILE, (void*)"1");