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

MXS-2481 Add timeout and comments

Browse Source 
When node is taken down, we don't wait forever.
Added comments that make it easier to follow the test when it
is running.
This commit is contained in:
Johan Wikman
2019-05-28 10:54:20 +03:00
parent dcc7d195a3
commit 6e5f7fcfbf
1 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
maxscale-system-test/clustrix_transaction_replay.cpp
View File

@ -87,7 +87,36 @@ void setup_database(TestConnections& test)
mysql_close(pMysql);
}
bool stop_server(TestConnections& test, const std::string& name, int node)
bool wait_for_state(TestConnections& test, const std::string& name, int timeout, const std::string& state)
{
MaxRest maxrest(&test);
MaxRest::Server server;
time_t start = time(nullptr);
time_t end;
do
{
server = maxrest.show_server(name);
if (server.state.find(state) == string::npos)
{
cout << name << " still not " << state << "..." << endl;
sleep(1);
}
end = time(nullptr);
}
while ((server.state.find(state) == string::npos) && (end - start < timeout));
test.expect(server.state.find(state) != string::npos,
"Clustrix node %s did not change state to %s within timeout of %d.",
name.c_str(), state.c_str(), timeout);
return server.state.find(state) != string::npos;
}
bool stop_server(TestConnections& test, const std::string& name, int node, int timeout)
{
bool stopped = false;
@ -98,23 +127,12 @@ bool stop_server(TestConnections& test, const std::string& name, int node)
if (rv.first == 0)
{
MaxRest maxrest(&test);
MaxRest::Server server;
do
if (wait_for_state(test, name, timeout, "Down"))
{
server = maxrest.show_server(name);
if (server.state.find("Down") == string::npos)
{
sleep(1);
}
}
while (server.state.find("Down") == string::npos);
cout << "Clustrix on node " << node << " is down." << endl;
stopped = true;
}
}
return stopped;
}
@ -130,30 +148,9 @@ bool start_server(TestConnections& test, const std::string& name, int node, int
if (rv.first == 0)
{
MaxRest maxrest(&test);
MaxRest::Server server;
time_t start = time(nullptr);
time_t end;
do
{
server = maxrest.show_server(name);
if (server.state.find("Down") != string::npos)
{
cout << "Still down..." << endl;
sleep(1);
}
end = time(nullptr);
}
while ((server.state.find("Down") != string::npos) && (end - start < timeout));
test.expect(end - start < timeout, "Clustrix node %d did not start.", node);
if (server.state.find("Master") != string::npos)
if (wait_for_state(test, name, timeout, "Master"))
{
cout << "Clustrix on node " << node << " is up." << endl;
started = true;
}
}
@ -174,20 +171,24 @@ MaxRest::Server get_current_server(TestConnections& test, MYSQL* pMysql)
void test_transaction_replay(TestConnections& test, MYSQL* pMysql, const std::string& name, int node)
{
cout << "Beginning transaction..." << endl;
test.try_query(pMysql, "BEGIN");
test.try_query(pMysql, "SELECT * FROM test.clustrix_tr");
cout << "Stopping server " << name << " on node " << node << "." << endl;
if (stop_server(test, name, node))
cout << "Stopping server " << name << "(node " << node << ")." << endl;
int timeout;
timeout = 60; // Going down should be fast...
if (stop_server(test, name, node, timeout))
{
// The server we were connected to is now down. If the following
// succeeds, then reconnect + transaction replay worked as specified.
cout << "Continuing transaction..." << endl;
test.try_query(pMysql, "SELECT * FROM test.clustrix_tr");
test.try_query(pMysql, "COMMIT");
cout << "Starting Clustrix " << name << " on node " << node << "." << endl;
cout << "Bring Clustrix " << name << "(node " << node << ") up again." << endl;
int timeout = 3 * 60;
timeout = 3 * 60; // Coming up takes time...
start_server(test, name, node, timeout);
}
}
@ -216,6 +217,7 @@ void run_test(TestConnections& test)
//
// This requires MaxScale to open a new connection to another node,
// seed the session and replay the transaction.
cout << "\nTESTING transaction replay when connected to node goes down." << endl;
test_transaction_replay(test, pMysql, dynamic_name, node);
MaxRest::Server server2 = get_current_server(test, pMysql);
@ -239,6 +241,7 @@ void run_test(TestConnections& test)
// That will cause a Clustrix Group Change event.
//
// This requires MaxScale to detect the error and replay the transaction.
cout << "\nTESTING transaction replay when group change error occurs." << endl;
test_transaction_replay(test, pMysql, server2.name, node);
server2 = get_current_server(test, pMysql);