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 
MXS-2645 was already fixed in 2.4.
This commit is contained in:
Esa Korhonen
2019-10-04 15:31:18 +03:00
parent 2d9d9356c9 c54e254ea0
commit 4791e043f1
1 changed files with 72 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
maxscale-system-test/connection_limit.cpp
View File

@ -6,38 +6,93 @@
* - create max num of connections and check tha N+1 connection fails * - create max num of connections and check tha N+1 connection fails
*/ */
#include <iostream>
#include <unistd.h>
#include "testconnections.h" #include "testconnections.h"
using namespace std; void check_with_wrong_pw(int router, int max_conn, TestConnections& test);
void check_max_conn(int router, int max_conn, TestConnections& test);
void check_max_conn(int router, int max_conn, TestConnections* Test) int main(int argc, char* argv[])
{
TestConnections test(argc, argv);
// First test with wrong pw to see that count is properly decremented.
test.tprintf("Trying 20 connections with RWSplit with wrong password\n");
check_with_wrong_pw(0, 20, test);
if (test.ok())
{
test.tprintf("Trying 11 connections with RWSplit\n");
check_max_conn(0, 10, test);
}
if (test.ok())
{
test.tprintf("Trying 21 connections with Readconn master\n");
check_max_conn(1, 20, test);
}
if (test.ok())
{
test.tprintf("Trying 26 connections with Readconnn slave\n");
check_max_conn(2, 25, test);
}
test.check_maxscale_alive(0);
int rval = test.global_result;
return rval;
}
void check_with_wrong_pw(int router, int max_conn, TestConnections& test)
{
// Check MXS-2645, connection count is not decremented properly when authentication fails.
const char wrong_pw[] = "batman";
bool limit_reached = false;
for (int i = 0; i < max_conn && !limit_reached; i++)
{
MYSQL* failed_conn = open_conn(
test.maxscales->ports[0][router], test.maxscales->IP[0],
test.maxscales->user_name, wrong_pw,
test.ssl);
auto error = mysql_errno(failed_conn);
if (error == 0)
{
test.expect(false, "Connection succeeded when it should have failed.");
}
else if (error == 1040)
{
test.expect(false, "Connection limit wrongfully reached.");
limit_reached = true;
}
mysql_close(failed_conn);
}
}
void check_max_conn(int router, int max_conn, TestConnections& test)
{ {
MYSQL* conn[max_conn + 1]; MYSQL* conn[max_conn + 1];
int i; int i;
for (i = 0; i < max_conn; i++) for (i = 0; i < max_conn; i++)
{ {
conn[i] = open_conn(Test->maxscales->ports[0][router], conn[i] = open_conn(test.maxscales->ports[0][router],
Test->maxscales->IP[0], test.maxscales->IP[0],
Test->maxscales->user_name, test.maxscales->user_name,
Test->maxscales->password, test.maxscales->password,
Test->ssl); test.ssl);
if (mysql_errno(conn[i]) != 0) if (mysql_errno(conn[i]) != 0)
{ {
Test->add_result(1, "Connection %d failed, error is %s\n", i, mysql_error(conn[i])); test.add_result(1, "Connection %d failed, error is %s\n", i, mysql_error(conn[i]));
} }
} }
conn[max_conn] = open_conn(Test->maxscales->ports[0][router], conn[max_conn] = open_conn(test.maxscales->ports[0][router],
Test->maxscales->IP[0], test.maxscales->IP[0],
Test->maxscales->user_name, test.maxscales->user_name,
Test->maxscales->password, test.maxscales->password,
Test->ssl); test.ssl);
if (mysql_errno(conn[i]) != 1040) if (mysql_errno(conn[i]) != 1040)
{ {
Test->add_result(1, test.add_result(1,
"Max_xonnections reached, but error is not 1040, it is %d %s\n", "Max_xonnections reached, but error is not 1040, it is %d %s\n",
mysql_errno(conn[i]), mysql_errno(conn[i]),
mysql_error(conn[i])); mysql_error(conn[i]));
@ -47,20 +102,3 @@ void check_max_conn(int router, int max_conn, TestConnections* Test)
mysql_close(conn[i]); mysql_close(conn[i]);
} }
} }
int main(int argc, char* argv[])
{
TestConnections* Test = new TestConnections(argc, argv);
Test->tprintf("Trying 11 connections with RWSplit\n");
check_max_conn(0, 10, Test);
Test->tprintf("Trying 21 connections with Readconn master\n");
check_max_conn(1, 20, Test);
Test->tprintf("Trying 26 connections with Readconnn slave\n");
check_max_conn(2, 25, Test);
Test->check_maxscale_alive(0);
int rval = Test->global_result;
delete Test;
return rval;
}