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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Esa Korhonen
2020-04-02 15:52:37 +03:00
parent 711d6a4083 a3e358f29b
commit e346c7b13b
5 changed files with 115 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
maxscale-system-test/maxtest/src/testconnections.cpp
View File

@ -15,6 +15,7 @@
#include <future>
#include <regex>
#include <maxbase/stacktrace.hh>
#include <algorithm>
#include "mariadb_func.h"
#include "maxadmin_operations.h"
@ -28,6 +29,20 @@ using std::cout;
using std::endl;
using std::string;
namespace
{
// These must match the labels recognized by MDBCI.
const string label_repl_be = "REPL_BACKEND";
const string label_galera_be = "GALERA_BACKEND";
const string label_big_be = "BIG_REPL_BACKEND";
const string label_2nd_mxs = "SECOND_MAXSCALE";
const string label_cs_be = "COLUMNSTORE_BACKEND";
const string label_clx_be = "CLUSTRIX_BACKEND";
const StringSet recognized_mdbci_labels =
{label_repl_be, label_big_be, label_galera_be, label_2nd_mxs, label_cs_be, label_clx_be};
}
namespace maxscale
{
@ -275,36 +290,36 @@ TestConnections::TestConnections(int argc, char* argv[])
m_test_name = (optind < argc) ? argv[optind] : basename(argv[0]);
set_template_and_labels();
tprintf("Test: '%s', config template: '%s', labels: '%s'",
m_test_name.c_str(), m_cnf_template_path.c_str(), m_labels.c_str());
m_test_name.c_str(), m_cnf_template_path.c_str(), m_test_labels_str.c_str());
set_mdbci_labels();
if (has_label(m_labels, "BACKEND_SSL"))
if (m_test_labels.count("BACKEND_SSL") > 0)
{
backend_ssl = true;
tprintf("Test has BACKEND_SSL label");
}
std::string delimiter = std::string (",");
size_t pos_start = 0, pos_end, delim_len = delimiter.length();
std::string label;
std::string mdbci_labels_c = m_mdbci_labels + delimiter;
StringSet missing_mdbci_labels;
std::set_difference(m_required_mdbci_labels.begin(), m_required_mdbci_labels.end(),
m_configured_mdbci_labels.begin(), m_configured_mdbci_labels.end(),
std::inserter(missing_mdbci_labels, missing_mdbci_labels.begin()));
bool mdbci_call_needed = false;
while ((pos_end = mdbci_labels_c.find (delimiter, pos_start)) != std::string::npos)
if (missing_mdbci_labels.empty())
{
label = mdbci_labels_c.substr (pos_start, pos_end - pos_start);
pos_start = pos_end + delim_len;
if (configured_labels.find(label, 0) == std::string::npos)
if (verbose)
{
mdbci_call_needed = true;
tprintf("Machines with label '%s' are not running, MDBCI UP call is needed", label.c_str());
}
else if (verbose)
{
tprintf("Machines with label '%s' are running, MDBCI UP call is not needed", label.c_str());
tprintf("Machines with all required labels '%s' are running, MDBCI UP call is not needed",
m_mdbci_labels_str.c_str());
}
}
else
{
string missing_labels_str = flatten_stringset(missing_mdbci_labels);
tprintf("Machines with labels '%s' are not running, MDBCI UP call is needed",
missing_labels_str.c_str());
mdbci_call_needed = true;
}
if (mdbci_call_needed)
{
@ -314,7 +329,7 @@ TestConnections::TestConnections(int argc, char* argv[])
}
}
if (m_mdbci_labels.find(std::string("REPL_BACKEND")) == std::string::npos)
if (m_required_mdbci_labels.count(label_repl_be) == 0)
{
no_repl = true;
if (verbose)
@ -323,7 +338,7 @@ TestConnections::TestConnections(int argc, char* argv[])
}
}
if (m_mdbci_labels.find(std::string("GALERA_BACKEND")) == std::string::npos)
if (m_required_mdbci_labels.count(label_galera_be) == 0)
{
no_galera = true;
if (verbose)
@ -332,7 +347,7 @@ TestConnections::TestConnections(int argc, char* argv[])
}
}
if (m_mdbci_labels.find(std::string("CLUSTRIX_BACKEND")) == std::string::npos)
if (m_required_mdbci_labels.count(label_clx_be) == 0)
{
no_clustrix = true;
if (verbose)
@ -673,7 +688,7 @@ void TestConnections::read_mdbci_info()
nc_file.open(vm_path + "_configured_labels");
std::stringstream strStream1;
strStream1 << nc_file.rdbuf();
configured_labels = strStream1.str();
m_configured_mdbci_labels = parse_to_stringset(strStream1.str());
nc_file.close();
}
else
@ -760,19 +775,19 @@ void TestConnections::set_template_and_labels()
if (found)
{
m_cnf_template_path = found->config_template;
m_labels = found->labels;
m_test_labels_str = found->labels;
}
else
{
printf("Failed to find configuration template for test '%s', using default template '%s'.\n",
m_test_name.c_str(), default_template);
printf("Failed to find configuration template for test '%s', using default template '%s' and "
"labels '%s'.\n",
m_test_name.c_str(), default_template, label_repl_be.c_str());
m_cnf_template_path = default_template;
m_test_labels_str = label_repl_be;
}
if (m_labels.empty())
{
m_labels = "REPL_BACKEND";
}
// Parse the labels-string to a set.
m_test_labels = parse_to_stringset(m_test_labels_str);
}
void TestConnections::process_template(int m, const string& cnf_template_path, const char* dest)
@ -2227,7 +2242,7 @@ int TestConnections::call_mdbci(const char * options)
if (system((std::string("mdbci up ") +
m_mdbci_config_name +
std::string(" --labels ") +
m_mdbci_labels +
m_mdbci_labels_str +
std::string(" ") +
std::string(options)).c_str() ))
{
@ -2337,5 +2352,59 @@ int TestConnections::reinstall_maxscales()
bool TestConnections::too_many_maxscales() const
{
return maxscales->N < 2 && m_mdbci_labels.find("SECOND_MAXSCALE") != std::string::npos;
return maxscales->N < 2 && m_required_mdbci_labels.count(label_2nd_mxs) > 0;
}
std::string TestConnections::flatten_stringset(const StringSet& set)
{
string rval;
string sep;
for (auto& elem : set)
{
rval += sep;
rval += elem;
sep = ",";
}
return rval;
}
StringSet TestConnections::parse_to_stringset(const string& source)
{
string copy = source;
StringSet rval;
if (!copy.empty())
{
char* ptr = &copy[0];
char* save_ptr = nullptr;
// mdbci uses ',' and cmake uses ';'. Add ' ' as well to ensure trimming.
const char delim[] = ",; ";
char* token = strtok_r(ptr, delim, &save_ptr);
while (token)
{
rval.insert(token);
token = strtok_r(nullptr, delim, &save_ptr);
}
}
return rval;
}
/**
* MDBCI recognizes labels which affect backend configuration. Save those labels to a separate field.
* Also save a string version.
*/
void TestConnections::set_mdbci_labels()
{
StringSet mdbci_labels;
mdbci_labels.insert("MAXSCALE");
std::set_intersection(recognized_mdbci_labels.begin(), recognized_mdbci_labels.end(),
m_test_labels.begin(), m_test_labels.end(),
std::inserter(mdbci_labels, mdbci_labels.begin()));
std::string mdbci_labels_str = flatten_stringset(mdbci_labels);
if (TestConnections::verbose)
{
printf("mdbci-labels: %s\n", mdbci_labels_str.c_str());
}
m_required_mdbci_labels = mdbci_labels;
m_mdbci_labels_str = mdbci_labels_str;
}