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

13
maxscale-system-test/mariadb_nodes.cpp
View File

@ -1145,16 +1145,13 @@ int Mariadb_nodes::truncate_mariadb_logs()
int local_result = 0;
for (int node = 0; node < N; node++)
{
char sys[PATH_MAX + 1500];
if (strcmp(IP[node], "127.0.0.1") != 0)
{
snprintf(sys,
sizeof(sys),
"ssh -i %s -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=quiet %s@%s 'sudo truncate /var/lib/mysql/*.err --size 0;sudo rm -f /etc/my.cnf.d/binlog_enc*\' &",
sshkey[node],
access_user[node],
IP[node]);
local_result += system(sys);
local_result += ssh_node_f(node, true,
"truncate -s 0 /var/lib/mysql/*.err;"
"truncate -s 0 /var/log/syslog;"
"truncate -s 0 /var/log/messages;"
"rm -f /etc/my.cnf.d/binlog_enc*;");
}
}
return local_result;

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

@ -247,7 +247,11 @@ int Maxscales::restart_maxscale(int m)
if (use_valgrind)
{
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
{

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)