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

MXS-2481 Check that server has changed

Browse Source
This commit is contained in:
Johan Wikman
2019-05-24 15:13:42 +03:00
parent 1c3ccfe254
commit e0b397455d
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,6 +160,17 @@ bool start_server(TestConnections& test, const std::string& name, int node, int
return started; return started;
} }
MaxRest::Server get_current_server(TestConnections& test, MYSQL* pMysql)
{
Row row = get_row(pMysql, "SELECT iface_ip FROM system.nodeinfo WHERE nodeid=gtmnid()");
test.expect(row.size() == 1, "1 row expected, %d received.", (int)row.size());
string address = row[0];
return dynamic_by_address[address];
}
void run_test(TestConnections& test) void run_test(TestConnections& test)
{ {
MaxRest maxrest(&test); MaxRest maxrest(&test);
@ -169,17 +180,13 @@ void run_test(TestConnections& test)
MYSQL* pMysql = pMaxscales->conn_rwsplit[0]; MYSQL* pMysql = pMaxscales->conn_rwsplit[0];
// What node are we connected to? MaxRest::Server server = get_current_server(test, pMysql);
Row row = get_row(pMysql, "SELECT iface_ip FROM system.nodeinfo WHERE nodeid=gtmnid()");
test.expect(row.size() == 1, "1 row expected, %d received.", (int)row.size()); string dynamic_name = server.name;
string static_name = static_by_address[server.address].name;
int node = node_by_address[server.address];
string ip = row[0]; cout << "Connected to " << server.address << ", which is "
string static_name = static_by_address[ip].name;
string dynamic_name = dynamic_by_address[ip].name;
int node = node_by_address[ip];
cout << "Connected to " << ip << ", which is "
<< dynamic_name << "(" << static_name << ") " << dynamic_name << "(" << static_name << ") "
<< " running on node " << node << "." << " running on node " << node << "."
<< endl; << endl;
@ -200,6 +207,10 @@ void run_test(TestConnections& test)
int timeout = 3 * 60; int timeout = 3 * 60;
start_server(test, dynamic_name, node, timeout); start_server(test, dynamic_name, node, timeout);
} }
MaxRest::Server server_after = get_current_server(test, pMysql);
test.expect(server.address != server_after.address, "Huh, server did not switch.");
} }
} }