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

fix start_maxscale for valgrind case

Browse Source
This commit is contained in:
Timofey Turenko
2019-03-08 11:47:11 +02:00
parent 267ec9cccc
commit c83868936a
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maxscale-system-test/maxscales.cpp
View File

@ -247,7 +247,11 @@ int Maxscales::restart_maxscale(int m)
if (use_valgrind) if (use_valgrind)
{ {
res = stop_maxscale(m); res = stop_maxscale(m);
res += start_maxscale(m); res = ssh_node_f(m, false,
"sudo --user=maxscale valgrind --leak-check=full --show-leak-kinds=all "
"--log-file=/%s/valgrind%02d.log --trace-children=yes "
"--track-origins=yes /usr/bin/maxscale", maxscale_log_dir[m], valgring_log_num);
valgring_log_num++;
} }
else else
{ {

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

@ -776,12 +776,16 @@ void TestConnections::init_maxscale(int m)
true, true,
"cp maxscale.cnf %s;" "cp maxscale.cnf %s;"
"iptables -F INPUT;" "iptables -F INPUT;"
"rm -rf %s/*.log /tmp/core* /dev/shm/* /var/lib/maxscale/maxscale.cnf.d/ /var/lib/maxscale/*;" "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",
maxscales->maxscale_cnf[m], maxscales->maxscale_cnf[m],
maxscales->maxscale_log_dir[m], maxscales->maxscale_log_dir[m]);
maxscale::start ? "service maxscale restart;" : ""); 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) void TestConnections::copy_one_mariadb_log(int i, std::string filename)