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

MXS-2458: add template for Clustrix monitor tests

Browse Source 
First implementation of Clustrix setup creation
TODO: move Clustrix installation to MDBCI
This commit is contained in:
Timofey Turenko
2019-05-07 17:17:57 +03:00
parent 4e6ffc0381
commit 56c27afd0a
12 changed files with 656 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,7 @@ TestConnections::TestConnections(int argc, char* argv[])
, binlog_master_gtid(false)
, binlog_slave_gtid(false)
, no_galera(false)
, no_clustrix(false)
, no_vm_revert(true)
, threads(4)
, use_ipv6(false)
@ -320,7 +321,6 @@ TestConnections::TestConnections(int argc, char* argv[])
{
exit(MDBCI_FAUILT);
}
}
if (mdbci_labels.find(std::string("REPL_BACKEND")) == std::string::npos)
@ -341,6 +341,15 @@ TestConnections::TestConnections(int argc, char* argv[])
}
}
if (mdbci_labels.find(std::string("CLUSTRIX_BACKEND")) == std::string::npos)
{
no_clustrix = true;
if (verbose)
{
tprintf("No need to use Clustrix");
}
}
get_logs_command = (char *) malloc(strlen(test_dir) + 14);
sprintf(get_logs_command, "%s/get_logs.sh", test_dir);
@ -386,6 +395,20 @@ TestConnections::TestConnections(int argc, char* argv[])
galera = NULL;
}
if (!no_clustrix)
{
clustrix = new Clustrix_nodes("clustrix", test_dir, verbose, network_config);
//galera->use_ipv6 = use_ipv6;
clustrix->use_ipv6 = false;
clustrix->take_snapshot_command = take_snapshot_command;
clustrix->revert_snapshot_command = revert_snapshot_command;
clustrix->start_cluster();
}
else
{
clustrix = NULL;
}
maxscales = new Maxscales("maxscale", test_dir, verbose, network_config);
bool maxscale_ok = maxscales->check_nodes();
@ -757,12 +780,13 @@ void TestConnections::process_template(int m, const char* template_name, const c
sprintf(str, "sed -i \"s/###threads###/%d/\" maxscale.cnf", threads);
system(str);
Mariadb_nodes * mdn[2];
Mariadb_nodes * mdn[3];
char * IPcnf;
mdn[0] = repl;
mdn[1] = galera;
mdn[2] = clustrix;
int i, j;
int mdn_n = galera ? 2 : 1;
int mdn_n = 3;
for (j = 0; j < mdn_n; j++)
{
@ -2220,7 +2244,6 @@ int TestConnections::call_mdbci(const char * options)
team_keys +
std::string(" ") +
std::string(mdbci_config_name)).c_str() );
read_env();
if (repl)
{