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
This commit is contained in:
Markus Mäkelä
2019-07-02 08:38:15 +03:00
parent 3424158b7c 8ee54b76d6
commit 3e85500491
16 changed files with 75 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs173_throttle_filter
View File

@ -56,7 +56,7 @@ port = 4009
[throttle]
type = filter
module = throttlefilter
max_qps = 1000
max_qps = 500
throttling_duration = 10000
sampling_duration = 250
continuous_duration = 2000

4
maxscale-system-test/mxs173_throttle_filter.cpp
View File

@ -15,7 +15,7 @@ DEFINE_EXCEPTION(Whoopsy);
// TODO these should be read from maxscale.cnf. Maybe the test-lib should replace
// any "###ENV_VAR###", with environment variables so that code and conf can share.
constexpr int max_qps = 1000;
constexpr int max_qps = 500;
constexpr float throttling_duration = 10000 / 1000.0;
constexpr float sampling_duration = 250 / 1000.0;
constexpr float continuous_duration = 2000 / 1000.0;
@ -132,7 +132,7 @@ void gauge_raw_speed(TestConnections& test)
std::ostringstream os;
os << "The raw speed is too slow, " << rs.qps
<< "qps, compared to max_qps = " << max_qps << "qps for accurate testing.";
test.add_result(1, "%s", os.str().c_str());
exit(0);
}
}

4
maxscale-system-test/mxs1776_ps_exec_hang.cpp
View File

@ -56,7 +56,8 @@ void run_test(TestConnections& test, TestCase test_case)
mysql_stmt_close(stmt);
test.expect(mysql_query(test.maxscales->conn_rwsplit[0], "SELECT 1") == 0, "Normal queries should work");
test.expect(mysql_query(test.maxscales->conn_rwsplit[0], "SELECT 1") == 0,
"Normal queries should work: %s", mysql_error(test.maxscales->conn_rwsplit[0]));
test.maxscales->disconnect();
}
@ -79,6 +80,7 @@ int main(int argc, char* argv[])
test.try_query(test.maxscales->conn_rwsplit[0], "COMMIT");
test.maxscales->disconnect();
test.repl->sync_slaves();
vector<TestCase> tests =
{

2
maxscale-system-test/test_ctrl_c/test_ctrl_c.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash
sudo service maxscale stop
sudo systemctl stop maxscale || sudo service maxscale stop
hm=`pwd`
$hm/start_killer.sh &

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

@ -2348,12 +2348,6 @@ int TestConnections::reinstall_maxscales()
maxscales->ssh_node(i, "yum remove maxscale -y", true);
maxscales->ssh_node(i, "yum clean all", true);
sprintf(sys, "mdbci setup_repo --product maxscale_ci --product-version %s %s/%s_%03d",
target, mdbci_config_name, maxscales->prefix, i);
if (system(sys))
{
return 1;
}
sprintf(sys, "mdbci install_product --product maxscale_ci --product-version %s %s/%s_%03d",
target, mdbci_config_name, maxscales->prefix, i);
if (system(sys))