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

Speed up mxs1961_standalone_rejoin

Browse Source 
The waits were needlessly long. Also cleaned up a bit.
This commit is contained in:
Esa Korhonen
2018-10-04 16:27:33 +03:00
parent a398da58a4
commit 1af43d4ff5
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
maxscale-system-test/mxs1961_standalone_rejoin.cpp
View File

@ -4,12 +4,13 @@
#include "testconnections.h" #include "testconnections.h"
#include <iostream> #include <iostream>
#include <maxbase/assert.h>
using namespace std; using namespace std;
void checkpoint(TestConnections& test) void checkpoint(TestConnections& test)
{ {
const int v = 5; const int v = 2;
test.maxscales->wait_for_monitor(v); test.maxscales->wait_for_monitor(v);
for (auto&& s : { for (auto&& s : {
@ -37,10 +38,8 @@ int main(int argc, char* argv[])
auto comment = [&](const char* comment) { auto comment = [&](const char* comment) {
cout << comment << endl; cout << comment << endl;
test.maxscales->ssh_node_f(0, test.maxscales->ssh_node_f(0, true,
true, "echo '----- %s -----' >> /var/log/maxscale/maxscale.log", comment);
"echo '----- %s -----' >> /var/log/maxscale/maxscale.log",
comment);
}; };
auto slave = [&](const char* name) { auto slave = [&](const char* name) {
@ -58,77 +57,79 @@ int main(int argc, char* argv[])
test.expect(status(name) == down, "'%s' should be down", name); test.expect(status(name) == down, "'%s' should be down", name);
}; };
auto block = [&](int node) { auto block = [&](int servernum) {
test.repl->block_node(node); mxb_assert(servernum >= 1);
test.repl->block_node(servernum - 1);
checkpoint(test); checkpoint(test);
}; };
auto unblock = [&](int node) { auto unblock = [&](int servernum) {
test.repl->unblock_node(node); mxb_assert(servernum >= 1);
test.repl->unblock_node(servernum - 1);
checkpoint(test); checkpoint(test);
}; };
test.maxscales->wait_for_monitor(1); checkpoint(test);
master("server1"); master("server1");
slave("server2"); slave("server2");
slave("server3"); slave("server3");
comment("Blocking server1"); comment("Blocking server1");
block(0);
comment("Blocking server2");
block(1); block(1);
comment("Blocking server2");
block(2);
down("server1"); down("server1");
down("server2"); down("server2");
master("server3"); master("server3");
comment("Unblocking server2"); comment("Unblocking server2");
unblock(1); unblock(2);
down("server1"); down("server1");
slave("server2"); slave("server2");
master("server3"); master("server3");
comment("Blocking server3"); comment("Blocking server3");
block(2); block(3);
comment("Unblocking server3"); comment("Unblocking server3");
unblock(2); unblock(3);
down("server1"); down("server1");
master("server2"); master("server2");
slave("server3"); slave("server3");
comment("Blocking server3"); comment("Blocking server3");
block(2); block(3);
down("server1"); down("server1");
master("server2"); master("server2");
down("server3"); down("server3");
comment("Unblocking server1"); comment("Unblocking server1");
unblock(0); unblock(1);
slave("server1"); slave("server1");
master("server2"); master("server2");
down("server3"); down("server3");
comment("Blocking server2"); comment("Blocking server2");
block(1); block(2);
master("server1"); master("server1");
down("server2"); down("server2");
down("server3"); down("server3");
comment("Unblocking server2"); comment("Unblocking server2");
unblock(1); unblock(2);
master("server1"); master("server1");
slave("server2"); slave("server2");
down("server3"); down("server3");
comment("Unblocking server3"); comment("Unblocking server3");
unblock(2); unblock(3);
master("server1"); master("server1");
slave("server2"); slave("server2");