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

Disable multi-MaxScale initialization by default

Browse Source 
Only tests that require multiple MaxScale instances should enable the
multi-MaxScale mode.
This commit is contained in:
Markus Mäkelä
2017-10-05 08:09:58 +03:00
parent a4271cb94e
commit 0cb72937cd
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ namespace maxscale
{ {
static bool start = true; static bool start = true;
static bool check_nodes = true; static bool check_nodes = true;
static bool multiple_maxscales = false;
static std::string required_repl_version; static std::string required_repl_version;
static std::string required_galera_version; static std::string required_galera_version;
} }
@ -62,6 +63,11 @@ void TestConnections::require_galera_version(const char *version)
maxscale::required_galera_version = version; maxscale::required_galera_version = version;
} }
void TestConnections::multiple_maxscales(bool value)
{
maxscale::multiple_maxscales = value;
}
TestConnections::TestConnections(int argc, char *argv[]): TestConnections::TestConnections(int argc, char *argv[]):
enable_timeouts(true), enable_timeouts(true),
global_result(0), global_result(0),
@ -285,7 +291,7 @@ TestConnections::TestConnections(int argc, char *argv[]):
{ {
init_maxscale(); init_maxscale();
if (!secondary_maxscale_IP.empty()) if (maxscale::multiple_maxscales && !secondary_maxscale_IP.empty())
{ {
set_active_maxscale(MXS_SECONDARY); set_active_maxscale(MXS_SECONDARY);
init_maxscale(); init_maxscale();

3
maxscale-system-test/testconnections.h
View File

@ -337,6 +337,9 @@ public:
static void require_repl_version(const char *version); static void require_repl_version(const char *version);
static void require_galera_version(const char *version); static void require_galera_version(const char *version);
/** Initialize multiple MaxScale instances */
void multiple_maxscales(bool value);
/** /**
* @brief add_result adds result to global_result and prints error message if result is not 0 * @brief add_result adds result to global_result and prints error message if result is not 0
* @param result 0 if step PASSED * @param result 0 if step PASSED