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

Fix test compilation failures

Browse Source 
The tests failed to compile due to invalid use of try_query. For some
reason this wasn't detected by newer compilers.

Also fixed the compilation failure of mxs1713_lots_of_database on CentOS
7.
This commit is contained in:
Markus Mäkelä
2018-07-02 12:44:10 +03:00
parent fa83901d03
commit ccdbfa8997
2 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
maxscale-system-test/mxs1713_lots_of_databases.cpp
View File

@ -43,9 +43,15 @@ int main(int argc, char** argv)
} }
test.tprintf("Done!"); test.tprintf("Done!");
test.assert(errors.empty(), "None of the queries should fail: %s", auto combiner = [](std::string& a, std::string b)
std::accumulate(errors.begin(), errors.end(), std::string(), {
[](const std::string &a, const std::string &b){return a + b + " ";})); a += b + " ";
return a;
};
std::string errstr;
std::accumulate(errors.begin(), errors.end(), errstr, combiner);
test.assert(errors.empty(), "None of the queries should fail: %s", errstr.c_str());
test.tprintf("Dropping databases..."); test.tprintf("Dropping databases...");
for (auto db : db_list) for (auto db : db_list)

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

@ -810,7 +810,7 @@ int TestConnections::copy_maxscale_logs(double timestamp)
} }
const char* command = "ls /tmp/core* && exit 42"; const char* command = "ls /tmp/core* && exit 42";
int rc = maxscales->ssh_node_f(i, true, command); int rc = maxscales->ssh_node_f(i, true, "%s", command);
assert(rc != 42, "Test should not generate core files"); assert(rc != 42, "Test should not generate core files");
} }
return 0; return 0;
@ -924,13 +924,13 @@ int TestConnections::start_binlog(int m)
{ {
// GTID to connect real Master // GTID to connect real Master
tprintf("GTID for connection 1st slave to master!\n"); tprintf("GTID for connection 1st slave to master!\n");
try_query(repl->nodes[1], (char *) "stop slave"); try_query(repl->nodes[1], "stop slave");
try_query(repl->nodes[1], (char *) "SET @@global.gtid_slave_pos=''"); try_query(repl->nodes[1], "SET @@global.gtid_slave_pos=''");
sprintf(sys1, sprintf(sys1,
"CHANGE MASTER TO MASTER_HOST='%s', MASTER_PORT=%d, MASTER_USER='repl', MASTER_PASSWORD='repl', MASTER_USE_GTID=Slave_pos", "CHANGE MASTER TO MASTER_HOST='%s', MASTER_PORT=%d, MASTER_USER='repl', MASTER_PASSWORD='repl', MASTER_USE_GTID=Slave_pos",
repl->IP[0], repl->port[0]); repl->IP[0], repl->port[0]);
try_query(repl->nodes[1], sys1); try_query(repl->nodes[1], "%s", sys1);
try_query(repl->nodes[1], (char *) "start slave"); try_query(repl->nodes[1], "start slave");
} }
else else
{ {
@ -941,7 +941,7 @@ int TestConnections::start_binlog(int m)
tprintf("Real master pos : %s\n", log_pos); tprintf("Real master pos : %s\n", log_pos);
tprintf("Stopping first slave (node 1)\n"); tprintf("Stopping first slave (node 1)\n");
try_query(repl->nodes[1], (char *) "stop slave;"); try_query(repl->nodes[1], "stop slave;");
//repl->no_set_pos = true; //repl->no_set_pos = true;
repl->no_set_pos = false; repl->no_set_pos = false;
tprintf("Configure first backend slave node to be slave of real master\n"); tprintf("Configure first backend slave node to be slave of real master\n");
@ -960,12 +960,12 @@ int TestConnections::start_binlog(int m)
{ {
// GTID to connect real Master // GTID to connect real Master
tprintf("GTID for connection binlog router to master!\n"); tprintf("GTID for connection binlog router to master!\n");
try_query(binlog, (char *) "stop slave"); try_query(binlog, "stop slave");
try_query(binlog, (char *) "SET @@global.gtid_slave_pos=''"); try_query(binlog, "SET @@global.gtid_slave_pos=''");
sprintf(sys1, sprintf(sys1,
"CHANGE MASTER TO MASTER_HOST='%s', MASTER_PORT=%d, MASTER_USER='repl', MASTER_PASSWORD='repl', MASTER_USE_GTID=Slave_pos", "CHANGE MASTER TO MASTER_HOST='%s', MASTER_PORT=%d, MASTER_USER='repl', MASTER_PASSWORD='repl', MASTER_USE_GTID=Slave_pos",
repl->IP[0], repl->port[0]); repl->IP[0], repl->port[0]);
try_query(binlog, sys1); try_query(binlog, "%s", sys1);
} }
else else
{ {
@ -982,7 +982,7 @@ int TestConnections::start_binlog(int m)
"CHANGE MASTER TO master_ssl_cert='%s/certs/client-cert.pem', master_ssl_ca='%s/certs/ca.pem', master_ssl=1, master_ssl_key='%s/certs/client-key.pem'", "CHANGE MASTER TO master_ssl_cert='%s/certs/client-cert.pem', master_ssl_ca='%s/certs/ca.pem', master_ssl=1, master_ssl_key='%s/certs/client-key.pem'",
maxscales->access_homedir[m], maxscales->access_homedir[m], maxscales->access_homedir[m]); maxscales->access_homedir[m], maxscales->access_homedir[m], maxscales->access_homedir[m]);
tprintf("Configuring Master ssl: %s\n", sys1); tprintf("Configuring Master ssl: %s\n", sys1);
try_query(binlog, sys1); try_query(binlog, "%s", sys1);
} }
try_query(binlog, "start slave"); try_query(binlog, "start slave");
try_query(binlog, "show slave status"); try_query(binlog, "show slave status");
@ -994,13 +994,13 @@ int TestConnections::start_binlog(int m)
fflush(stdout); fflush(stdout);
for (i = 2; i < repl->N; i++) for (i = 2; i < repl->N; i++)
{ {
try_query(repl->nodes[i], (char *) "stop slave"); try_query(repl->nodes[i], "stop slave");
try_query(repl->nodes[i], (char *) "SET @@global.gtid_slave_pos=''"); try_query(repl->nodes[i], "SET @@global.gtid_slave_pos=''");
sprintf(sys1, sprintf(sys1,
"CHANGE MASTER TO MASTER_HOST='%s', MASTER_PORT=%d, MASTER_USER='repl', MASTER_PASSWORD='repl', MASTER_USE_GTID=Slave_pos", "CHANGE MASTER TO MASTER_HOST='%s', MASTER_PORT=%d, MASTER_USER='repl', MASTER_PASSWORD='repl', MASTER_USE_GTID=Slave_pos",
maxscales->IP[m], maxscales->binlog_port[m]); maxscales->IP[m], maxscales->binlog_port[m]);
try_query(repl->nodes[i], sys1); try_query(repl->nodes[i], "%s", sys1);
try_query(repl->nodes[i], (char *) "start slave"); try_query(repl->nodes[i], "start slave");
} }
} }
else else
@ -1019,7 +1019,7 @@ int TestConnections::start_binlog(int m)
fflush(stdout); fflush(stdout);
for (i = 2; i < repl->N; i++) for (i = 2; i < repl->N; i++)
{ {
try_query(repl->nodes[i], (char *) "stop slave"); try_query(repl->nodes[i], "stop slave");
repl->set_slave(repl->nodes[i], maxscales->IP[m], maxscales->binlog_port[m], log_file, log_pos); repl->set_slave(repl->nodes[i], maxscales->IP[m], maxscales->binlog_port[m], log_file, log_pos);
} }
} }
@ -1364,13 +1364,13 @@ int TestConnections::check_maxscale_alive(int m)
tprintf("Trying simple query against all sevices\n"); tprintf("Trying simple query against all sevices\n");
tprintf("RWSplit \n"); tprintf("RWSplit \n");
set_timeout(10); set_timeout(10);
try_query(maxscales->conn_rwsplit[m], (char *) "show databases;"); try_query(maxscales->conn_rwsplit[m], "show databases;");
tprintf("ReadConn Master \n"); tprintf("ReadConn Master \n");
set_timeout(10); set_timeout(10);
try_query(maxscales->conn_master[m], (char *) "show databases;"); try_query(maxscales->conn_master[m], "show databases;");
tprintf("ReadConn Slave \n"); tprintf("ReadConn Slave \n");
set_timeout(10); set_timeout(10);
try_query(maxscales->conn_slave[m], (char *) "show databases;"); try_query(maxscales->conn_slave[m], "show databases;");
set_timeout(10); set_timeout(10);
maxscales->close_maxscale_connections(m); maxscales->close_maxscale_connections(m);
add_result(global_result - gr, "Maxscale is not alive\n"); add_result(global_result - gr, "Maxscale is not alive\n");
@ -1705,6 +1705,8 @@ void *log_copy_thread( void *ptr )
Test->tprintf("\n **** Copying all logs *** \n"); Test->tprintf("\n **** Copying all logs *** \n");
Test->copy_all_logs_periodic(); Test->copy_all_logs_periodic();
} }
return NULL;
} }
int TestConnections::insert_select(int m, int N) int TestConnections::insert_select(int m, int N)
@ -1848,9 +1850,9 @@ int TestConnections::try_query(MYSQL *conn, const char *format, ...)
int TestConnections::try_query_all(int m, const char *sql) int TestConnections::try_query_all(int m, const char *sql)
{ {
return try_query(maxscales->conn_rwsplit[m], sql) + return try_query(maxscales->conn_rwsplit[m], "%s", sql) +
try_query(maxscales->conn_master[m], sql) + try_query(maxscales->conn_master[m], "%s", sql) +
try_query(maxscales->conn_slave[m], sql); try_query(maxscales->conn_slave[m], "%s", sql);
} }
StringSet TestConnections::get_server_status(const char* name) StringSet TestConnections::get_server_status(const char* name)