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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2020-07-02 10:38:54 +03:00
parent 31591dbf00 c9badcb09c
commit 9f07613330
3 changed files with 94 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maxscale-system-test/maxtest/src/mariadb_nodes.cc
View File

@ -455,12 +455,14 @@ int Galera_nodes::start_galera()
for (int i = 0; i < N; i++)
{
// Remove the grastate.dat file
ssh_node(i, "rm -f /var/lib/mysql/grastate.dat", true);
ssh_node(i, "echo [mysqld] > cluster_address.cnf", true);
ssh_node_f(i, true, "echo wsrep_cluster_address=gcomm://%s >> cluster_address.cnf", gcomm.c_str());
ssh_node(i, "cp cluster_address.cnf /etc/my.cnf.d/", true);
ssh_node(i, "rm -rf /var/lib/mysql/*", true);
ssh_node(i, "mysql_install_db --user=mysql", true);
ssh_node_f(i,
true,
"sed -i 's/###NODE-ADDRESS###/%s/' /etc/my.cnf.d/* /etc/mysql/my.cnf.d/*;"
@ -474,7 +476,7 @@ int Galera_nodes::start_galera()
// Start the first node that also starts a new cluster
ssh_node_f(0, true, "galera_new_cluster");
for (int i = 0; i < N; i++)
for (int i = 1; i < N; i++)
{
if (start_node(i, "") != 0)
{

4
maxscale-system-test/maxtest/src/testconnections.cc
View File

@ -1035,10 +1035,10 @@ int TestConnections::copy_maxscale_logs(double timestamp)
"rm -rf %s/logs;"
"mkdir %s/logs;"
"cp %s/*.log %s/logs/;"
"cp /tmp/core* %s/logs/;"
"test -e /tmp/core* && cp /tmp/core* %s/logs/;"
"cp %s %s/logs/;"
"chmod 777 -R %s/logs;"
"ls /tmp/core* && exit 42;",
"test -e /tmp/core* && exit 42;",
maxscales->access_homedir[i],
maxscales->access_homedir[i],
maxscales->maxscale_log_dir[i],