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

Uncrustify maxscale

Browse Source 
See script directory for method. The script to run in the top level
MaxScale directory is called maxscale-uncrustify.sh, which uses
another script, list-src, from the same directory (so you need to set
your PATH). The uncrustify version was 0.66.
This commit is contained in:
Niclas Antti
2018-09-09 22:26:19 +03:00
parent fa7ec95069
commit c447e5cf15
849 changed files with 35002 additions and 27238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,55 +2,55 @@
* @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
[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
* [RW Split Router]
* type=service
* router=readwritesplit
* servers=server1,server2,server3,server4
* weightby=serversize_rws
* user=skysql
* passwd=skysql
*
* [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
@ -61,12 +61,14 @@ serversize_rws=1000000
#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],
(char *) "test");
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]);
if ((i < 4) && (Nc[i] != conn_num))
{
@ -75,12 +77,12 @@ void check_conn_num(TestConnections* Test, int * Nc)
}
}
int main(int argc, char *argv[])
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);
MYSQL* conn_read[maxscale_conn_num];
MYSQL* conn_rwsplit[0][maxscale_conn_num];
TestConnections* Test = new TestConnections(argc, argv);
Test->set_timeout(30);
int i;
@ -144,12 +146,15 @@ int main(int argc, char *argv[])
}
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);
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);
// 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;