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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-07-06 14:56:19 +03:00
parent f2b8487577 cb05199bac
commit bfd3d2975d
8 changed files with 68 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxscale-system-test/CMakeLists.txt
View File

@ -1019,6 +1019,10 @@ add_test_executable(mxs1926_killed_server.cpp mxs1926_killed_server mxs1926_kill
# https://jira.mariadb.org/browse/MXS-1932
add_test_executable(mxs1932_hidden_cnf.cpp mxs1932_hidden_cnf replication LABELS REPL_BACKEND)
# MXS-1949: Warning for user load failure logged even when service has no users
# https://jira.mariadb.org/browse/MXS-1949
add_test_executable(mxs1949_warn_user_injection.cpp mxs1949_warn_user_injection avro LABELS REPL_BACKEND)
# MXS-1958: Users with insert-only privileges don't work
# https://jira.mariadb.org/browse/MXS-1958
add_test_executable(mxs1958_insert_priv.cpp mxs1958_insert_priv replication LABELS REPL_BACKEND)

15
maxscale-system-test/mxs1949_warn_user_injection.cpp Normal file
View File

@ -0,0 +1,15 @@
/**
* MXS-1949: Warning for user load failure logged even when service has no users
*
* Check that the message is not logged when services have no servers and
* 'inject_service_user' is enabled.
*/
#include "testconnections.h"
int main(int argc, char *argv[])
{
TestConnections test(argc, argv);
test.check_log_err(0, " No users were loaded but 'inject_service_user' is enabled", false);
return test.global_result;
}

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

@ -239,6 +239,15 @@ TestConnections::TestConnections(int argc, char *argv[]):
maxscales->use_ipv6 = use_ipv6;
maxscales->ssl = ssl;
// Stop MaxScale to prevent it from interfering with the replication setup process
if (!maxscale::manual_debug)
{
for (int i = 0; i < maxscales->N; i++)
{
maxscales->stop(i);
}
}
if (maxscale::required_repl_version.length())
{
int ver_repl_required = get_int_version(maxscale::required_repl_version);
@ -646,11 +655,6 @@ void TestConnections::init_maxscale(int m)
{
const char * template_name = get_template_name(test_name);
if (!maxscale::manual_debug)
{
stop_maxscale(m);
}
process_template(m, template_name, maxscales->access_homedir[m]);
maxscales->ssh_node_f(m, true,
"cp maxscale.cnf %s;rm -rf %s/certs;mkdir -m a+wrx %s/certs;",