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

Remove implicit initialization of all maxscales

Browse Source 
The extra maxscale instances are only started if the test explicitly
requests it.
This commit is contained in:
Markus Mäkelä
2018-09-12 10:24:34 +03:00
parent 643480240c
commit f6840fbded
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ static bool check_nodes = true;
static bool manual_debug = false;
static std::string required_repl_version;
static std::string required_galera_version;
static bool multiple_maxscales = false;
}
static void signal_set(int sig, void (*handler)(int))
@ -55,6 +56,11 @@ void TestConnections::skip_maxscale_start(bool value)
maxscale::start = !value;
}
void TestConnections::multiple_maxscales(bool value)
{
maxscale::multiple_maxscales = value;
}
void TestConnections::require_repl_version(const char *version)
{
maxscale::required_repl_version = version;
@ -648,9 +654,15 @@ void TestConnections::process_template(int m, const char *template_name, const c
void TestConnections::init_maxscales()
{
for (int i = 0; i < maxscales->N; i++)
// Always initialize the first MaxScale
init_maxscale(0);
if (maxscale::multiple_maxscales)
{
init_maxscale(i);
for (int i = 1; i < maxscales->N; i++)
{
init_maxscale(i);
}
}
}