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

Merge test changes from 2.3

Browse Source
This commit is contained in:
Timofey Turenko
2019-12-16 20:01:35 +02:00
parent e3402c42cc aa801c74c5
commit a2eafc2381
31 changed files with 88 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -838,7 +838,7 @@ void TestConnections::process_template(int m, const char* template_name, const c
}
else
{
IPcnf = mdn[j]->IP[i];
IPcnf = mdn[j]->IP_private[i];
}
sprintf(str, "sed -i \"s/###%s_server_IP_%0d###/%s/\" maxscale.cnf",
mdn[j]->prefix, i + 1, IPcnf);
@ -1198,7 +1198,7 @@ int TestConnections::start_binlog(int m)
try_query(repl->nodes[1], "SET @@global.gtid_slave_pos=''");
sprintf(sys1,
"CHANGE MASTER TO MASTER_HOST='%s', MASTER_PORT=%d, MASTER_USER='repl', MASTER_PASSWORD='repl', MASTER_USE_GTID=Slave_pos",
repl->IP[0],
repl->IP_private[0],
repl->port[0]);
try_query(repl->nodes[1], "%s", sys1);
try_query(repl->nodes[1], "start slave");
@ -1216,7 +1216,7 @@ int TestConnections::start_binlog(int m)
// repl->no_set_pos = true;
repl->no_set_pos = false;
tprintf("Configure first backend slave node to be slave of real master\n");
repl->set_slave(repl->nodes[1], repl->IP[0], repl->port[0], log_file, log_pos);
repl->set_slave(repl->nodes[1], repl->IP_private[0], repl->port[0], log_file, log_pos);
}
if (!local_maxscale)
@ -1243,7 +1243,7 @@ int TestConnections::start_binlog(int m)
try_query(binlog, "SET @@global.gtid_slave_pos=''");
sprintf(sys1,
"CHANGE MASTER TO MASTER_HOST='%s', MASTER_PORT=%d, MASTER_USER='repl', MASTER_PASSWORD='repl', MASTER_USE_GTID=Slave_pos",
repl->IP[0],
repl->IP_private[0],
repl->port[0]);
try_query(binlog, "%s", sys1);
}
@ -1251,7 +1251,7 @@ int TestConnections::start_binlog(int m)
{
repl->no_set_pos = true;
tprintf("configuring Maxscale binlog router\n");
repl->set_slave(binlog, repl->IP[0], repl->port[0], log_file, log_pos);
repl->set_slave(binlog, repl->IP_private[0], repl->port[0], log_file, log_pos);
}
// ssl between binlog router and Master
if (backend_ssl)
@ -1278,7 +1278,7 @@ int TestConnections::start_binlog(int m)
try_query(repl->nodes[i], "SET @@global.gtid_slave_pos=''");
sprintf(sys1,
"CHANGE MASTER TO MASTER_HOST='%s', MASTER_PORT=%d, MASTER_USER='repl', MASTER_PASSWORD='repl', MASTER_USE_GTID=Slave_pos",
maxscales->IP[m],
maxscales->IP_private[m],
maxscales->binlog_port[m]);
try_query(repl->nodes[i], "%s", sys1);
try_query(repl->nodes[i], "start slave");
@ -1301,7 +1301,7 @@ int TestConnections::start_binlog(int m)
for (i = 2; i < repl->N; i++)
{
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_private[m], maxscales->binlog_port[m], log_file, log_pos);
}
}
@ -1341,7 +1341,7 @@ bool TestConnections::replicate_from_master(int m)
conn = open_conn_no_db(maxscales->binlog_port[m], maxscales->IP[m], repl->user_name, repl->password, ssl);
if (find_field(repl->nodes[0], "show master status", "File", log_file)
|| repl->set_slave(conn, repl->IP[0], repl->port[0], log_file, log_pos)
|| repl->set_slave(conn, repl->IP_private[0], repl->port[0], log_file, log_pos)
|| execute_query(conn, "start slave"))
{
rval = false;
@ -1362,7 +1362,7 @@ void TestConnections::revert_replicate_from_master()
for (int i = 1; i < repl->N; i++)
{
repl->set_slave(repl->nodes[i], repl->IP[0], repl->port[0], log_file, (char*)"4");
repl->set_slave(repl->nodes[i], repl->IP_private[0], repl->port[0], log_file, (char*)"4");
execute_query(repl->nodes[i], "start slave");
}
}
@ -1402,8 +1402,8 @@ int TestConnections::start_mm(int m)
find_field(repl->nodes[1], (char*) "show master status", (char*) "File", log_file2);
find_field(repl->nodes[1], (char*) "show master status", (char*) "Position", log_pos2);
repl->set_slave(repl->nodes[0], repl->IP[1], repl->port[1], log_file2, log_pos2);
repl->set_slave(repl->nodes[1], repl->IP[0], repl->port[0], log_file1, log_pos1);
repl->set_slave(repl->nodes[0], repl->IP_private[1], repl->port[1], log_file2, log_pos2);
repl->set_slave(repl->nodes[1], repl->IP_private[0], repl->port[0], log_file1, log_pos1);
repl->close_connections();