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

45
maxscale-system-test/fwf.cpp
View File

@ -1,13 +1,16 @@
/**
* @file fwf - Firewall filter test (also regression test for MXS-683 "qc_mysqlembedded reports as-name instead of original-name")
* @file fwf - Firewall filter test (also regression test for MXS-683 "qc_mysqlembedded reports as-name
*instead of original-name")
* - setup Firewall filter to use rules from rule file fw/ruleXX, where XX - number of sub-test
* - execute queries for fw/passXX file, expect OK
* - execute queries from fw/denyXX, expect Access Denied error (mysql_error 1141)
* - repeat for all XX
* - setup Firewall filter to block queries next 2 minutes using 'at_time' statement (see template fw/rules_at_time)
* - setup Firewall filter to block queries next 2 minutes using 'at_time' statement (see template
*fw/rules_at_time)
* - start sending queries, expect Access Denied now and OK after two mintes
* - setup Firewall filter to limit a number of queries during certain time
* - start sending queries as fast as possible, expect OK for N first quries and Access Denied for next queries
* - start sending queries as fast as possible, expect OK for N first quries and Access Denied for next
*queries
* - wait, start sending queries again, but only one query per second, expect OK
* - try to load rules with syntax error, expect failure for all sessions and queries
*/
@ -20,10 +23,10 @@
#include "sql_t1.h"
#include "fw_copy_rules.h"
int main(int argc, char *argv[])
int main(int argc, char* argv[])
{
TestConnections::skip_maxscale_start(true);
TestConnections * Test = new TestConnections(argc, argv);
TestConnections* Test = new TestConnections(argc, argv);
int local_result;
char str[4096];
char sql[4096];
@ -32,7 +35,9 @@ int main(int argc, char *argv[])
char rules_dir[4096];
FILE* file;
Test->maxscales->ssh_node_f(0, true, "cd %s;"
Test->maxscales->ssh_node_f(0,
true,
"cd %s;"
"rm -rf rules;"
"mkdir rules;"
"chown vagrant:vagrant rules",
@ -109,7 +114,9 @@ int main(int argc, char *argv[])
if (mysql_errno(Test->maxscales->conn_rwsplit[0]) != 1141)
{
Test->tprintf("Expected 1141, Access Denied but got %d, %s instead: %s",
mysql_errno(Test->maxscales->conn_rwsplit[0]), mysql_error(Test->maxscales->conn_rwsplit[0]), sql);
mysql_errno(Test->maxscales->conn_rwsplit[0]),
mysql_error(Test->maxscales->conn_rwsplit[0]),
sql);
local_result++;
}
}
@ -140,7 +147,7 @@ int main(int argc, char *argv[])
{
Test->tprintf("Trying at_times clause");
}
copy_rules(Test, (char *) "rules_at_time", rules_dir);
copy_rules(Test, (char*) "rules_at_time", rules_dir);
if (Test->verbose)
@ -148,10 +155,13 @@ int main(int argc, char *argv[])
Test->tprintf("DELETE quries without WHERE clause will be blocked during the 15 seconds");
Test->tprintf("Put time to rules.txt: %s", str);
}
Test->maxscales->ssh_node_f(0, false, "start_time=`date +%%T`;"
Test->maxscales->ssh_node_f(0,
false,
"start_time=`date +%%T`;"
"stop_time=` date --date \"now +15 secs\" +%%T`;"
"%s sed -i \"s/###time###/$start_time-$stop_time/\" %s/rules/rules.txt",
Test->maxscales->access_sudo[0], Test->maxscales->access_homedir[0]);
Test->maxscales->access_sudo[0],
Test->maxscales->access_homedir[0]);
Test->maxscales->restart_maxscale(0);
Test->maxscales->connect_rwsplit(0);
@ -161,7 +171,8 @@ int main(int argc, char *argv[])
if (mysql_errno(Test->maxscales->conn_rwsplit[0]) != 1141)
{
Test->add_result(1, "Query succeded, but fail expected, errono is %d",
Test->add_result(1,
"Query succeded, but fail expected, errono is %d",
mysql_errno(Test->maxscales->conn_rwsplit[0]));
}
@ -177,7 +188,7 @@ int main(int argc, char *argv[])
Test->tprintf("Trying limit_queries clause");
Test->tprintf("Copying rules to Maxscale machine: %s", str);
copy_rules(Test, (char *) "rules_limit_queries", rules_dir);
copy_rules(Test, (char*) "rules_limit_queries", rules_dir);
Test->maxscales->start_maxscale(0);
Test->maxscales->connect_rwsplit(0);
@ -186,7 +197,8 @@ int main(int argc, char *argv[])
for (i = 0; i < 10; i++)
{
Test->add_result(execute_query_silent(Test->maxscales->conn_rwsplit[0], "SELECT * FROM t1"),
"%d -query failed", i);
"%d -query failed",
i);
}
Test->tprintf("Expecting failures during next 5 seconds");
@ -202,8 +214,8 @@ int main(int argc, char *argv[])
elapsedTime = (t2.tv_sec - t1.tv_sec);
elapsedTime += (double) (t2.tv_usec - t1.tv_usec) / 1000000.0;
}
while ((execute_query_silent(Test->maxscales->conn_rwsplit[0], "SELECT * FROM t1") != 0) &&
(elapsedTime < 10));
while ((execute_query_silent(Test->maxscales->conn_rwsplit[0], "SELECT * FROM t1") != 0)
&& (elapsedTime < 10));
Test->tprintf("Quries were blocked during %f (using clock_gettime())", elapsedTime);
Test->tprintf("Quries were blocked during %lu (using time())", time(NULL) - start_time_clock);
@ -218,7 +230,8 @@ int main(int argc, char *argv[])
for (i = 0; i < 12; i++)
{
sleep(1);
Test->add_result(execute_query_silent(Test->maxscales->conn_rwsplit[0], "SELECT * FROM t1"), "query failed");
Test->add_result(execute_query_silent(Test->maxscales->conn_rwsplit[0], "SELECT * FROM t1"),
"query failed");
if (Test->verbose)
{
Test->tprintf("%d ", i);