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

MXS-173 Test for throttling filter

Browse Source 
The test may fail if the client/maxscale/mariadb combo is too slow.
TODO, maybe: today I saw mysql_query() hang (in a poll) when maxscale
disconnected. Is there something that can be done about that?
I added a source directory, base, for stuff that should become part of a common
utility library in the future.
This commit is contained in:
Niclas Antti
2018-05-24 10:43:03 +03:00
parent 40b31621c8
commit f62d155036
8 changed files with 671 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,8 +504,14 @@ void TestConnections::print_env()
printf("Maxscale SSH key\t%s\n", maxscales->sshkey[0]);
printf("Maxadmin password\t%s\n", maxscales->maxadmin_password[0]);
printf("Access user\t%s\n", maxscales->access_user[0]);
repl->print_env();
galera->print_env();
if (repl)
{
repl->print_env();
}
if (galera)
{
galera->print_env();
}
}
const char * get_template_name(char * test_name)
@ -686,7 +692,10 @@ int TestConnections::copy_mariadb_logs(Mariadb_nodes * repl, char * prefix)
int exit_code;
char str[4096];
if (repl == NULL) return local_result;
if (repl == NULL)
{
return local_result;
}
sprintf(str, "mkdir -p LOGS/%s", test_name);
system(str);
@ -1817,7 +1826,9 @@ StringSet TestConnections::get_server_status(const char* name)
char* p = tok;
char *end = strchr(tok, '\n');
if (!end)
{
end = strchr(tok, '\0');
}
// Trim leading whitespace
while (p < end && isspace(*p))
@ -1913,14 +1924,14 @@ std::string dump_status(const StringSet& current, const StringSet& expected)
std::stringstream ss;
ss << "Current status: (";
for (const auto& a: current)
for (const auto& a : current)
{
ss << a << ",";
}
ss << ") Expected status: (";
for (const auto& a: expected)
for (const auto& a : expected)
{
ss << a << ",";
}