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

MXS-2546 Separate slave connection settings to its own class

Browse Source 
The settings are different from the other fields in that they should not change
on their own. Most manipulation functions only require the settings.

Also takes into use a class for host and port data.
This commit is contained in:
Esa Korhonen
2019-07-16 19:11:54 +03:00
parent 0257e6e690
commit 2a1925744b
7 changed files with 225 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/monitor/mariadbmon/test/test_cycle_find.cc
View File

@ -213,13 +213,13 @@ void MariaDBMonitor::Test::add_replication(EdgeArray edges)
break;
}
SlaveStatus ss;
MariaDBServer* slave = get_server(slave_id);
SlaveStatus ss(slave->name());
ss.slave_io_running = SlaveStatus::SLAVE_IO_YES;
ss.slave_sql_running = true;
if (m_use_hostnames)
{
ss.master_host = create_hostname(master_id);
ss.master_port = master_id;
ss.settings.master_endpoint = EndPoint(create_hostname(master_id), master_id);
}
else
{
@ -227,7 +227,6 @@ void MariaDBMonitor::Test::add_replication(EdgeArray edges)
ss.seen_connected = true;
}
MariaDBServer* slave = get_server(slave_id);
slave->m_slave_status.push_back(ss);
}