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

2.2 fix restore (#152)

Browse Source 
* refactor test backend fixing

* return comatibility with 5.5 for backend restore

* remove backend configuration scripts

* adopt test backed restore function for 2.2 test fw
This commit is contained in:
Timofey Turenko
2017-12-18 23:47:07 +02:00
committed by GitHub
parent b9e7eaf3aa
commit 1006ec506a
11 changed files with 453 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,13 +203,17 @@ TestConnections::TestConnections(int argc, char *argv[]):
galera = new Galera_nodes("galera", test_dir, verbose);
//galera->use_ipv6 = use_ipv6;
galera->use_ipv6 = false;
galera->take_snapshot_command = take_snapshot_command;
galera->revert_snapshot_command = revert_snapshot_command;
}
else
{
galera = repl;
galera = NULL;
}
repl->use_ipv6 = use_ipv6;
repl->take_snapshot_command = take_snapshot_command;
repl->revert_snapshot_command = revert_snapshot_command;
maxscales = new Maxscales("maxscale", test_dir, verbose);
@ -551,8 +555,14 @@ void TestConnections::process_template(int m, const char *template_name, const c
mdn[0] = repl;
mdn[1] = galera;
int i, j;
int mdn_n = 1;
for (j = 0; j < 2; j++)
if (galera == NULL)
{
mdn_n =1;
}
for (j = 0; j < mdn_n; j++)
{
for (i = 0; i < mdn[j]->N; i++)
{
@ -657,6 +667,8 @@ int TestConnections::copy_mariadb_logs(Mariadb_nodes * repl, char * prefix)
int exit_code;
char str[4096];
if (repl == NULL) return local_result;
sprintf(str, "mkdir -p LOGS/%s", test_name);
system(str);
for (i = 0; i < repl->N; i++)