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

Add methods for changing the active MaxScale instance

Browse Source 
The new function allows two MaxScale instances to be controlled via the
same TestConnections object. This will allow testing of Maxscale clusters.
This commit is contained in:
Markus Mäkelä
2017-10-04 10:57:12 +03:00
parent 9f74878794
commit 503e768d80
2 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,6 +278,13 @@ TestConnections::TestConnections(int argc, char *argv[]):
if (maxscale_init) if (maxscale_init)
{ {
init_maxscale(); init_maxscale();
if (!secondary_maxscale_IP.empty())
{
set_active_maxscale(MXS_SECONDARY);
init_maxscale();
set_active_maxscale(MXS_PRIMARY);
}
} }
if (backend_ssl) if (backend_ssl)
@ -372,12 +379,28 @@ int TestConnections::read_env()
if (env != NULL) if (env != NULL)
{ {
sprintf(maxscale_IP, "%s", env); sprintf(maxscale_IP, "%s", env);
primary_maxscale_IP = env;
} }
env = getenv("maxscale_network6"); env = getenv("maxscale_network6");
if (env != NULL) if (env != NULL)
{ {
sprintf(maxscale_IP6, "%s", env); sprintf(maxscale_IP6, "%s", env);
primary_maxscale_IP6 = env;
} }
env = getenv("maxscale2_IP");
if (env != NULL)
{
secondary_maxscale_IP = env;
}
env = getenv("maxscale2_network6");
if (env != NULL)
{
secondary_maxscale_IP = env;
}
env = getenv("maxscale_user"); env = getenv("maxscale_user");
if (env != NULL) if (env != NULL)
{ {
@ -2235,3 +2258,24 @@ char* TestConnections::maxscale_ip() const
{ {
return use_ipv6 ? (char*)maxscale_IP6 : (char*)maxscale_IP; return use_ipv6 ? (char*)maxscale_IP6 : (char*)maxscale_IP;
} }
void TestConnections::set_active_maxscale(enum test_target target)
{
switch (target)
{
case MXS_PRIMARY:
strcpy(maxscale_IP, primary_maxscale_IP.c_str());
strcpy(maxscale_IP6, primary_maxscale_IP6.c_str());
break;
case MXS_SECONDARY:
strcpy(maxscale_IP, secondary_maxscale_IP.c_str());
strcpy(maxscale_IP6, secondary_maxscale_IP6.c_str());
break;
default:
tprintf("Wrong enum value for 'set_active_maxscale': 0x%02x", target);
exit(1);
break;
}
}

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

@ -7,6 +7,12 @@
#include <pthread.h> #include <pthread.h>
#include <sys/time.h> #include <sys/time.h>
enum test_target
{
MXS_PRIMARY,
MXS_SECONDARY
};
/** /**
* @brief Class contains references to Master/Slave and Galera test setups * @brief Class contains references to Master/Slave and Galera test setups
* Test setup should consist of two setups: one Master/Slave and one Galera. * Test setup should consist of two setups: one Master/Slave and one Galera.
@ -123,6 +129,12 @@ public:
*/ */
char maxscale_IP[1024]; char maxscale_IP[1024];
/** IPv4 and IPv6 addresses for the primary and secondary instances */
std::string primary_maxscale_IP;
std::string primary_maxscale_IP6;
std::string secondary_maxscale_IP;
std::string secondary_maxscale_IP6;
/** /**
* @brief Maxscale_IP6 Maxscale machine IP address (IPv6) * @brief Maxscale_IP6 Maxscale machine IP address (IPv6)
*/ */
@ -715,6 +727,13 @@ public:
* @param dest Destination file name for actual configuration file * @param dest Destination file name for actual configuration file
*/ */
void process_template(const char *src, const char *dest = "/etc/maxscale.cnf"); void process_template(const char *src, const char *dest = "/etc/maxscale.cnf");
/**
* @brief Change the target MaxScale
*
* @param target Either MXS_PRIMARY or MXS_SECONDARY
*/
void set_active_maxscale(enum test_target target);
}; };
/** /**