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

Refactor server_weight

Browse Source 
Changed to stack allocated objects, removed unnecessary and corrected
false comments, removed obsolete log message checks.
This commit is contained in:
Markus Mäkelä 2018-09-20 09:00:23 +03:00
parent f9e876db06
commit ce43df5514
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
1 changed files with 28 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
maxscale-system-test/server_weight.cpp
View File

@ -1,78 +1,27 @@
/**
* @file server_weight.cpp Checks if 'weightby' parameter works
* - use Galera setup, configure Maxscale
* @verbatim
* [RW Split Router]
* type=service
* router=readwritesplit
* servers=server1,server2,server3,server4
* weightby=serversize_rws
* user=skysql
* passwd=skysql
* Check if 'weightby' parameter works
*
* [Read Connection Router]
* type=service
* router=readconnroute
* router_options=synced
* servers=server1,server2,server3,server4
* weightby=serversize
* user=skysql
* passwd=skysql
*
* [server1]
* type=server
* address=###server_IP_1###
* port=###server_port_1###
* protocol=MySQLBackend
* serversize=1
* serversize_rws=1
*
* [server2]
* type=server
* address=###server_IP_2###
* port=###server_port_2###
* protocol=MySQLBackend
* serversize=2
* serversize_rws=3000000
*
* [server3]
* type=server
* address=###server_IP_3###
* port=###server_port_3###
* protocol=MySQLBackend
* serversize=3
* serversize_rws=2000000
*
* [server4]
* type=server
* address=###server_IP_4###
* port=###server_port_4###
* protocol=MySQLBackend
* serversize=0
* serversize_rws=1000000
* @endverbatim
* - create 60 connections to ReadConn master
* - expect: node1 - 10, node2 - 20, node3 - 30, node4 - 0
* - create 60 connections to RWSplit
* - expect all connections on only one slave
* - check error log, it should not contain "Unexpected parameter 'weightby'"
* - expect: node1 - 60, node2 - 30, node3 - 20, node4 - 10
*/
#include "testconnections.h"
void check_conn_num(TestConnections* Test, int* Nc)
void check_conn_num(TestConnections& test, int* Nc)
{
for (int i = 0; i < 4; i++)
{
int conn_num = get_conn_num(Test->galera->nodes[i],
Test->maxscales->IP[0],
Test->maxscales->hostname[0],
int conn_num = get_conn_num(test.galera->nodes[i],
test.maxscales->IP[0],
test.maxscales->hostname[0],
(char*) "test");
Test->tprintf("connections to node %d: %u (expected: %u)\n", i, conn_num, Nc[i]);
test.tprintf("connections to node %d: %u (expected: %u)\n", i, conn_num, Nc[i]);
if ((i < 4) && (Nc[i] != conn_num))
{
Test->add_result(1, "Read: Expected number of connections to node %d is %d\n", i, Nc[i]);
test.add_result(1, "Read: Expected number of connections to node %d is %d\n", i, Nc[i]);
}
}
}
@ -82,20 +31,20 @@ int main(int argc, char* argv[])
int maxscale_conn_num = 60;
MYSQL* conn_read[maxscale_conn_num];
MYSQL* conn_rwsplit[0][maxscale_conn_num];
TestConnections* Test = new TestConnections(argc, argv);
Test->set_timeout(30);
TestConnections test(argc, argv);
test.set_timeout(30);
int i;
Test->galera->connect();
test.galera->connect();
Test->tprintf("Connecting to ReadConnMaster on %s\n", Test->maxscales->IP[0]);
test.tprintf("Connecting to ReadConnMaster on %s\n", test.maxscales->IP[0]);
for (i = 0; i < maxscale_conn_num; i++)
{
conn_read[i] = Test->maxscales->open_readconn_master_connection(0);
conn_read[i] = test.maxscales->open_readconn_master_connection(0);
}
Test->stop_timeout();
Test->tprintf("Sleeping 15 seconds\n");
test.stop_timeout();
test.tprintf("Sleeping 15 seconds\n");
sleep(15);
int Nc[4];
@ -105,27 +54,27 @@ int main(int argc, char* argv[])
Nc[2] = maxscale_conn_num / 2;
Nc[3] = 0;
Test->set_timeout(30);
check_conn_num(Test, Nc);
test.set_timeout(30);
check_conn_num(test, Nc);
for (i = 0; i < maxscale_conn_num; i++)
{
mysql_close(conn_read[i]);
}
Test->stop_timeout();
Test->tprintf("Sleeping 15 seconds\n");
test.stop_timeout();
test.tprintf("Sleeping 15 seconds\n");
sleep(15);
Test->set_timeout(30);
Test->tprintf("Connecting to RWSplit on %s\n", Test->maxscales->IP[0]);
test.set_timeout(30);
test.tprintf("Connecting to RWSplit on %s\n", test.maxscales->IP[0]);
for (i = 0; i < maxscale_conn_num; i++)
{
conn_rwsplit[0][i] = Test->maxscales->open_rwsplit_connection(0);
conn_rwsplit[0][i] = test.maxscales->open_rwsplit_connection(0);
}
Test->stop_timeout();
Test->tprintf("Sleeping 15 seconds\n");
test.stop_timeout();
test.tprintf("Sleeping 15 seconds\n");
sleep(15);
/** Readwritesplit should always create a connection to the master. For
@ -136,28 +85,15 @@ int main(int argc, char* argv[])
Nc[3] = maxscale_conn_num / 6;
Nc[0] = maxscale_conn_num;
Test->set_timeout(30);
check_conn_num(Test, Nc);
test.set_timeout(30);
check_conn_num(test, Nc);
for (i = 0; i < maxscale_conn_num; i++)
{
mysql_close(conn_rwsplit[0][i]);
}
Test->galera->close_connections();
test.galera->close_connections();
Test->check_log_err(0, (char*) "Unexpected parameter 'weightby'", false);
Test->check_log_err(0,
(char*)
"Weighting parameter 'serversize' with a value of 0 for server 'server4' rounds down to zero",
true);
// Pre-1.3.0 failure message
// Test->check_log_err(0, (char *) "Server 'server4' has no value for weighting parameter 'serversize', no
// queries will be routed to this server", true);
int rval = Test->global_result;
delete Test;
return rval;
return test.global_result;
}