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

Skip unnecessary reconfiguration

Browse Source 
The coredump configuration needs to be done only if nodes were restored or
if MaxScale was reinstalled.
This commit is contained in:
Markus Mäkelä
2019-06-28 08:48:03 +03:00
parent 02395102ed
commit 760f887566
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,9 +415,11 @@ TestConnections::TestConnections(int argc, char* argv[])
bool repl_ok = no_repl || repl_future.get(); bool repl_ok = no_repl || repl_future.get();
bool galera_ok = no_galera || galera_future.get(); bool galera_ok = no_galera || galera_future.get();
bool node_error = !maxscale_ok || !repl_ok || !galera_ok; bool node_error = !maxscale_ok || !repl_ok || !galera_ok;
bool initialize = false;
if (node_error || too_many_maxscales()) if (node_error || too_many_maxscales())
{ {
initialize = true;
tprintf("Recreating VMs: %s", node_error ? "node check failed" : "too many maxscales"); tprintf("Recreating VMs: %s", node_error ? "node check failed" : "too many maxscales");
if (call_mdbci("--recreate")) if (call_mdbci("--recreate"))
@ -426,16 +428,24 @@ TestConnections::TestConnections(int argc, char* argv[])
} }
} }
if (reinstall_maxscale && reinstall_maxscales()) if (reinstall_maxscale)
{ {
tprintf("Failed to install Maxscale: target is %s", target); initialize = true;
exit(MDBCI_FAUILT);
if (reinstall_maxscales())
{
tprintf("Failed to install Maxscale: target is %s", target);
exit(MDBCI_FAUILT);
}
} }
std::string src = std::string(test_dir) + "/mdbci/add_core_cnf.sh"; if (initialize)
maxscales->copy_to_node(0, src.c_str(), maxscales->access_homedir[0]); {
maxscales->ssh_node_f(0, true, "%s/add_core_cnf.sh %s", maxscales->access_homedir[0], std::string src = std::string(test_dir) + "/mdbci/add_core_cnf.sh";
verbose ? "verbose" : ""); maxscales->copy_to_node(0, src.c_str(), maxscales->access_homedir[0]);
maxscales->ssh_node_f(0, true, "%s/add_core_cnf.sh %s", maxscales->access_homedir[0],
verbose ? "verbose" : "");
}
maxscales->use_ipv6 = use_ipv6; maxscales->use_ipv6 = use_ipv6;