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

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
Markus Mäkelä
2018-03-20 12:38:23 +02:00
parent 28e4133669 02368473f7
commit b0e0a79b46
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/Changelog.md
View File

@ -54,6 +54,7 @@ For more details, please refer to:
* MaxScale now supports IPv6 * MaxScale now supports IPv6
For more details, please refer to: For more details, please refer to:
* [MariaDB MaxScale 2.1.15 Release Notes](Release-Notes/MaxScale-2.1.15-Release-Notes.md)
* [MariaDB MaxScale 2.1.14 Release Notes](Release-Notes/MaxScale-2.1.14-Release-Notes.md) * [MariaDB MaxScale 2.1.14 Release Notes](Release-Notes/MaxScale-2.1.14-Release-Notes.md)
* [MariaDB MaxScale 2.1.13 Release Notes](Release-Notes/MaxScale-2.1.13-Release-Notes.md) * [MariaDB MaxScale 2.1.13 Release Notes](Release-Notes/MaxScale-2.1.13-Release-Notes.md)
* [MariaDB MaxScale 2.1.12 Release Notes](Release-Notes/MaxScale-2.1.12-Release-Notes.md) * [MariaDB MaxScale 2.1.12 Release Notes](Release-Notes/MaxScale-2.1.12-Release-Notes.md)

4
maxscale-system-test/copy_logs.sh
View File

@ -51,3 +51,7 @@ else
rsync -a --no-o --no-g LOGS $logs_publish_dir rsync -a --no-o --no-g LOGS $logs_publish_dir
fi fi
for i in `find $logs_dir -name 'core*'`
do
test -e $i && echo "Test failed: core files generated" && exit 1
done

5
maxscale-system-test/failover_mysqlmon.cpp
View File

@ -64,10 +64,9 @@ int main(int argc, char *argv[])
"@@server_id is different: %s != %s", maxscale_id, real_id); "@@server_id is different: %s != %s", maxscale_id, real_id);
test->close_maxscale_connections(); test->close_maxscale_connections();
test->ssh_maxscale(true, "maxadmin clear server server1 maintenance"); test->stop_maxscale();
test->ssh_maxscale(true, "maxadmin clear server server2 maintenance");
test->ssh_maxscale(true, "maxadmin clear server server3 maintenance");
test->repl->fix_replication(); test->repl->fix_replication();
test->start_maxscale();
test->tprintf("Check that MaxScale is running "); test->tprintf("Check that MaxScale is running ");
test->check_maxscale_alive(); test->check_maxscale_alive();

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

@ -1394,7 +1394,7 @@ int Mariadb_nodes::prepare_server(int i)
char str1[1024]; char str1[1024];
char str2[1024]; char str2[1024];
ssh_node(i, stop_db_command[i], true); ssh_node_f(i, true, "%s", stop_db_command[i]);
sleep(5); sleep(5);
ssh_node(i, "sed -i \"s/bind-address/#bind-address/g\" /etc/mysql/my.cnf.d/*.cnf", true); ssh_node(i, "sed -i \"s/bind-address/#bind-address/g\" /etc/mysql/my.cnf.d/*.cnf", true);
ssh_node(i, "ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/usr.sbin.mysqld; sudo service apparmor restart", true); ssh_node(i, "ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/usr.sbin.mysqld; sudo service apparmor restart", true);