From 0daa167873ff15cd3938bb429cf8e2e64204dd0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 17 Aug 2017 23:47:46 +0300 Subject: [PATCH 1/2] Fix bug519 The test attempted to copy the generated CSV file from the MaxScale server when in fact it was on the master server. Removed HEAVY label from the test as it takes about 10 seconds to run. Cherry-picked from commit f80cde2af149fda9c47d8f9131f82527b76af487. --- maxscale-system-test/CMakeLists.txt | 2 +- maxscale-system-test/bug519.cpp | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt index b2798cb78..96caa88e6 100644 --- a/maxscale-system-test/CMakeLists.txt +++ b/maxscale-system-test/CMakeLists.txt @@ -109,7 +109,7 @@ add_test_executable(bug507.cpp bug507 replication LABELS readwritesplit LIGHT RE add_test_executable(bug509.cpp bug509 galera LABELS readwritesplit GALERA_BACKEND) # Checks "SELECT * INTO OUTFILE" and "LOAD DATA LOCAL INFILE" -add_test_executable(bug519.cpp bug519 replication LABELS readwritesplit HEAVY REPL_BACKEND) +add_test_executable(bug519.cpp bug519 replication LABELS readwritesplit REPL_BACKEND) # Regression case for the bug "'Current no. of conns' not going down" add_test_executable(bug529.cpp bug529 replication LABELS readwritesplit readconnroute maxscale REPL_BACKEND) diff --git a/maxscale-system-test/bug519.cpp b/maxscale-system-test/bug519.cpp index 9cfb474bb..79b4c34da 100644 --- a/maxscale-system-test/bug519.cpp +++ b/maxscale-system-test/bug519.cpp @@ -106,12 +106,7 @@ int main(int argc, char *argv[]) Test->try_query(Test->conn_slave, (char *) "SELECT * INTO OUTFILE '/tmp/t3.csv' FROM t1;"); Test->tprintf("Copying t1.cvs from Maxscale machine:\n"); - Test->copy_from_maxscale((char *) "/tmp/t1.csv", (char *) "./"); - /*sprintf(str, - "scp -i %s -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=quiet %s@%s:/tmp/t1.csv ./", - Test->repl->sshkey[0], Test->repl->access_user[0], Test->repl->IP[0]); - Test->tprintf("%s\n", str); - system(str);*/ + Test->repl->copy_from_node("/tmp/t1.csv", "./t1.csv", 0); MYSQL *srv[2]; From f4cd2c62b6abb2cf4a27a262caea84a6834ab08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 7 Sep 2017 18:38:08 +0300 Subject: [PATCH 2/2] Backport mxs1110_16mb fixes to 2.1 Backported changes to mxs1110_16mb from develop into 2.1. --- maxscale-system-test/mxs1110_16mb.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maxscale-system-test/mxs1110_16mb.cpp b/maxscale-system-test/mxs1110_16mb.cpp index 7788b7116..5497373af 100644 --- a/maxscale-system-test/mxs1110_16mb.cpp +++ b/maxscale-system-test/mxs1110_16mb.cpp @@ -13,6 +13,7 @@ int main(int argc, char *argv[]) { TestConnections::skip_maxscale_start(true); TestConnections * Test = new TestConnections(argc, argv); + Test->stop_maxscale(); Test->set_timeout(60); int chunk_size = 2500000; int chunk_num = 5; @@ -26,6 +27,7 @@ int main(int argc, char *argv[]) Test->start_maxscale(); Test->repl->execute_query_all_nodes( (char *) "set global max_allowed_packet=100000000"); + Test->galera->execute_query_all_nodes( (char *) "set global max_allowed_packet=100000000"); Test->connect_maxscale(); Test->repl->connect(); @@ -34,6 +36,7 @@ int main(int argc, char *argv[]) Test->repl->close_connections(); Test->close_maxscale_connections(); + Test->repl->sync_slaves(); Test->connect_maxscale(); Test->tprintf("Checking data via RWSplit\n"); check_longblob_data(Test, Test->conn_rwsplit, chunk_size, chunk_num, 2);