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

23
maxscale-system-test/check_backend.cpp
View File

@ -18,15 +18,23 @@ int main(int argc, char *argv[])
Test->tprintf("Connecting to Maxscale maxscales->routers[0] with Master/Slave backend\n");
Test->maxscales->connect_maxscale(0);
Test->tprintf("Testing connections\n");
Test->add_result(Test->test_maxscale_connections(0, true, true, true), "Can't connect to backend\n");
Test->tprintf("Connecting to Maxscale router with Galera backend\n");
MYSQL * g_conn = open_conn(4016 , Test->maxscales->IP[0], Test->maxscales->user_name,
Test->maxscales->password, Test->ssl);
if (g_conn != NULL )
if ((Test->galera != NULL) && (Test->galera->N != 0))
{
Test->tprintf("Testing connection\n");
Test->add_result(Test->try_query(g_conn, (char *) "SELECT 1"),
(char *) "Error executing query against RWSplit Galera\n");
Test->tprintf("Connecting to Maxscale router with Galera backend\n");
MYSQL * g_conn = open_conn(4016 , Test->maxscales->IP[0], Test->maxscales->user_name, Test->maxscales->password, Test->ssl);
if (g_conn != NULL )
{
Test->tprintf("Testing connection\n");
Test->add_result(Test->try_query(g_conn, (char *) "SELECT 1"),
(char *) "Error executing query against RWSplit Galera\n");
}
}
else
{
Test->tprintf("Galera is not in use\n");
}
Test->tprintf("Closing connections\n");
Test->maxscales->close_maxscale_connections(0);
@ -45,7 +53,6 @@ int main(int argc, char *argv[])
Test->tprintf("Snapshots are not in use\n");
}
int rval = Test->global_result;
delete Test;
return rval;