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

MXS-1745 Remove unused fields

Browse Source 
The binlog file and position are no longer used. Gtid_IO_Pos can fulfill
the same purpose if needed.
This commit is contained in:
Esa Korhonen
2018-04-26 12:20:09 +03:00
parent de1e299f3f
commit ba4700a983
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/modules/monitor/mariadbmon/mariadbserver.cc
View File

@ -34,7 +34,6 @@ SlaveStatus::SlaveStatus()
, master_port(0) , master_port(0)
, slave_io_running(SLAVE_IO_NO) , slave_io_running(SLAVE_IO_NO)
, slave_sql_running(false) , slave_sql_running(false)
, read_master_log_pos(0)
{} {}
MariaDBServer::MariaDBServer(MXS_MONITORED_SERVER* monitored_server) MariaDBServer::MariaDBServer(MXS_MONITORED_SERVER* monitored_server)
@ -118,16 +117,13 @@ bool MariaDBServer::do_show_slave_status()
auto i_slave_io_running = result->get_col_index("Slave_IO_Running"); auto i_slave_io_running = result->get_col_index("Slave_IO_Running");
auto i_slave_sql_running = result->get_col_index("Slave_SQL_Running"); auto i_slave_sql_running = result->get_col_index("Slave_SQL_Running");
auto i_master_server_id = result->get_col_index("Master_Server_Id"); auto i_master_server_id = result->get_col_index("Master_Server_Id");
auto i_master_log_file = result->get_col_index("Master_Log_File");
auto i_read_master_log_pos = result->get_col_index("Read_Master_Log_Pos");
auto i_last_io_errno = result->get_col_index("Last_IO_Errno"); auto i_last_io_errno = result->get_col_index("Last_IO_Errno");
auto i_last_io_error = result->get_col_index("Last_IO_Error"); auto i_last_io_error = result->get_col_index("Last_IO_Error");
auto i_last_sql_error = result->get_col_index("Last_SQL_Error"); auto i_last_sql_error = result->get_col_index("Last_SQL_Error");
const char INVALID_DATA[] = "'%s' returned invalid data."; const char INVALID_DATA[] = "'%s' returned invalid data.";
if (i_master_host < 0 || i_master_port < 0 || i_slave_io_running < 0 || i_slave_sql_running < 0 || if (i_master_host < 0 || i_master_port < 0 || i_slave_io_running < 0 || i_slave_sql_running < 0 ||
i_master_log_file < 0 || i_read_master_log_pos < 0 || i_master_server_id < 0 || i_master_server_id < 0 || i_last_io_errno < 0 || i_last_io_error < 0 || i_last_sql_error < 0)
i_last_io_errno < 0 || i_last_io_error < 0 || i_last_sql_error < 0)
{ {
MXS_ERROR(INVALID_DATA, query.c_str()); MXS_ERROR(INVALID_DATA, query.c_str());
return false; return false;
@ -169,8 +165,6 @@ bool MariaDBServer::do_show_slave_status()
{ {
// TODO: Fix for multisource replication, check changes to IO_Pos here and save somewhere. // TODO: Fix for multisource replication, check changes to IO_Pos here and save somewhere.
sstatus.master_server_id = result->get_uint(i_master_server_id); sstatus.master_server_id = result->get_uint(i_master_server_id);
sstatus.master_log_file = result->get_string(i_master_log_file);
sstatus.read_master_log_pos = result->get_uint(i_read_master_log_pos);
if (sstatus.slave_sql_running) if (sstatus.slave_sql_running)
{ {
nrunning++; nrunning++;
@ -417,8 +411,6 @@ string MariaDBServer::diagnostics(bool multimaster) const
SlaveStatus::slave_io_to_string(m_slave_status[0].slave_io_running) << "\n"; SlaveStatus::slave_io_to_string(m_slave_status[0].slave_io_running) << "\n";
ss << "Slave SQL running: " << (m_slave_status[0].slave_sql_running ? "YES" : "NO") << "\n"; ss << "Slave SQL running: " << (m_slave_status[0].slave_sql_running ? "YES" : "NO") << "\n";
ss << "Master ID: " << m_slave_status[0].master_server_id << "\n"; ss << "Master ID: " << m_slave_status[0].master_server_id << "\n";
ss << "Master binlog file: " << m_slave_status[0].master_log_file << "\n";
ss << "Master binlog position: " << m_slave_status[0].read_master_log_pos << "\n";
} }
if (!m_gtid_current_pos.empty()) if (!m_gtid_current_pos.empty())
{ {
@ -452,10 +444,6 @@ json_t* MariaDBServer::diagnostics_json(bool multimaster) const
json_string(SlaveStatus::slave_io_to_string(m_slave_status[0].slave_io_running).c_str())); json_string(SlaveStatus::slave_io_to_string(m_slave_status[0].slave_io_running).c_str()));
json_object_set_new(srv, "slave_sql_running", json_boolean(m_slave_status[0].slave_sql_running)); json_object_set_new(srv, "slave_sql_running", json_boolean(m_slave_status[0].slave_sql_running));
json_object_set_new(srv, "master_id", json_integer(m_slave_status[0].master_server_id)); json_object_set_new(srv, "master_id", json_integer(m_slave_status[0].master_server_id));
json_object_set_new(srv, "master_binlog_file",
json_string(m_slave_status[0].master_log_file.c_str()));
json_object_set_new(srv, "master_binlog_position",
json_integer(m_slave_status[0].read_master_log_pos));
} }
if (!m_gtid_current_pos.empty()) if (!m_gtid_current_pos.empty())
{ {

2
server/modules/monitor/mariadbmon/mariadbserver.hh
View File

@ -46,8 +46,6 @@ public:
bool slave_sql_running; /**< Slave SQL thread running state, true if "Yes" */ bool slave_sql_running; /**< Slave SQL thread running state, true if "Yes" */
std::string master_log_file; /**< Name of the master binary log file that the I/O thread is currently std::string master_log_file; /**< Name of the master binary log file that the I/O thread is currently
* reading from. */ * reading from. */
uint64_t read_master_log_pos; /**< Position up to which the I/O thread has read in the current master
* binary log file. */
GtidList gtid_io_pos; /**< Gtid I/O position of the slave thread. */ GtidList gtid_io_pos; /**< Gtid I/O position of the slave thread. */
std::string last_error; /**< Last IO or SQL error encountered. */ std::string last_error; /**< Last IO or SQL error encountered. */