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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-04-15 16:17:54 +03:00
parent 21b4cc3944 9941f7d763
commit e119077328
5 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,10 +273,13 @@ TestConnections::TestConnections(int argc, char* argv[])
}
}
test_name = basename(argv[0]);
if (!strcmp(test_name, "non_native_setup"))
if (optind < argc)
{
test_name = argv[1];
test_name = argv[optind];
}
else
{
test_name = basename(argv[0]);
}
const char * labels_string = NULL;
@ -424,6 +427,24 @@ TestConnections::TestConnections(int argc, char* argv[])
}
}
if ((maxscale::restart_galera) && (galera))
{
galera->stop_nodes();
galera->start_replication();
}
if (maxscale::check_nodes)
{
if (repl && !repl->fix_replication())
{
exit(BROKEN_VM_FAUILT);
}
if (galera && !galera->fix_replication())
{
exit(BROKEN_VM_FAUILT);
}
}
if (repl && maxscale::required_repl_version.length())
{
int ver_repl_required = get_int_version(maxscale::required_repl_version);
@ -454,24 +475,6 @@ TestConnections::TestConnections(int argc, char* argv[])
}
}
if ((maxscale::restart_galera) && (galera))
{
galera->stop_nodes();
galera->start_replication();
}
if (maxscale::check_nodes)
{
if (repl && !repl->fix_replication())
{
exit(BROKEN_VM_FAUILT);
}
if (galera && !galera->fix_replication())
{
exit(BROKEN_VM_FAUILT);
}
}
if (maxscale_init)
{
init_maxscales();
@ -616,7 +619,8 @@ void TestConnections::read_mdbci_info()
target = readenv("target", "develop");
mdbci_config_name = readenv("mdbci_config_name", "local");
vm_path = std::string(mdbci_vm_path) + std::string(mdbci_config_name);
vm_path = std::string(mdbci_vm_path) + "/" + std::string(mdbci_config_name);
if (mdbci_config_name != NULL)
{
std::ifstream nc_file;
@ -2206,6 +2210,13 @@ int TestConnections::call_mdbci(const char * options)
tprintf("MDBCI failed to bring up virtual machines");
return 1;
}
std::string team_keys = readenv("team_keys", "~/.ssh/id_rsa.pub");
system((std::string("mdbci public_keys --key ") +
team_keys +
std::string(" ") +
std::string(mdbci_config_name)).c_str() );
read_env();
if (repl)
{