hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-03-11 12:27:42 +02:00
parent 18a30f05c2 3081bfbb1e
commit 1c3a5bda83
13 changed files with 47 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maxscale-system-test/testconnections.cpp
View File

@ -791,12 +791,16 @@ void TestConnections::init_maxscale(int m)
true,
"cp maxscale.cnf %s;"
"iptables -F INPUT;"
"rm -rf %s/*.log /tmp/core* /dev/shm/* /var/lib/maxscale/maxscale.cnf.d/ /var/lib/maxscale/*;"
"%s"
"maxctrl api get maxscale/debug/monitor_wait",
"rm -rf %s/*.log /tmp/core* /dev/shm/* /var/lib/maxscale/maxscale.cnf.d/ /var/lib/maxscale/*;",
maxscales->maxscale_cnf[m],
maxscales->maxscale_log_dir[m],
maxscale::start ? "service maxscale restart;" : "");
maxscales->maxscale_log_dir[m]);
if (maxscale::start)
{
maxscales->restart_maxscale(m);
maxscales->ssh_node_f(m,
true,
"maxctrl api get maxscale/debug/monitor_wait");
}
}
void TestConnections::copy_one_mariadb_log(int i, std::string filename)