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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Esa Korhonen
2018-09-13 13:08:25 +03:00
committed by Timofey Turenko
parent 7ec2f77708 b3d6e49061
commit 8c561c6e55
13 changed files with 34 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maxscale-system-test/mysqlmon_failover_stress.cpp
View File

@ -31,8 +31,8 @@ const time_t MONITOR_INTERVAL = 1;
// been performed. Not very critical.
const time_t FAILOVER_DURATION = 5;
// How long should we keep in running.
const time_t TEST_DURATION = 90;
// The test now runs only two failovers. Change for a longer time limit later.
// TODO: add semisync to remove this limitation.
#define CMESSAGE(msg) \
do { \
@ -519,11 +519,9 @@ void run(TestConnections& test)
cout << "Starting clients." << endl;
Client::start(test.verbose, zHost, port, zUser, zPassword);
time_t start = time(NULL);
list_servers(test);
while (time(NULL) - start < TEST_DURATION)
for (int i = 0; i < 2; i++)
{
test.set_timeout(20);
test.maxscales->wait_for_monitor();
@ -555,7 +553,7 @@ void run(TestConnections& test)
}
else
{
test.expect(false, "Unexpected master id: %d");
test.expect(false, "Unexpected master id: %d", master_id);
}
}