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

Define inline functions for status variables

Browse Source 
The functions are used in MariaDB Monitor.
This commit is contained in:
Esa Korhonen
2018-07-25 13:58:09 +03:00
parent 6c59da77fb
commit 18bfca0533
3 changed files with 76 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/monitor/mariadbmon/cluster_manipulation.cc
View File

@ -1215,7 +1215,7 @@ bool MariaDBMonitor::switchover_check_current(const MXS_MONITORED_SERVER* sugges
mon_serv != NULL && extra_master == NULL;
mon_serv = mon_serv->next)
{
if (srv_master_status(mon_serv->pending_status))
if (status_is_master(mon_serv->pending_status))
{
if (mon_serv == suggested_curr_master)
{

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

@ -435,38 +435,32 @@ bool MariaDBServer::wait_until_gtid(const GtidList& target, int timeout, json_t*
bool MariaDBServer::is_master() const
{
// Similar to macro SERVER_IS_MASTER
return srv_master_status(m_server_base->pending_status);
return status_is_master(m_server_base->pending_status);
}
bool MariaDBServer::is_slave() const
{
// Similar to macro SERVER_IS_SLAVE
return (m_server_base->pending_status & (SERVER_RUNNING | SERVER_SLAVE | SERVER_MAINT)) ==
(SERVER_RUNNING | SERVER_SLAVE);
return status_is_slave(m_server_base->pending_status);
}
bool MariaDBServer::is_running() const
{
// Similar to macro SERVER_IS_RUNNING
return (m_server_base->pending_status & (SERVER_RUNNING | SERVER_MAINT)) == SERVER_RUNNING;
return status_is_running(m_server_base->pending_status);
}
bool MariaDBServer::is_down() const
{
// Similar to macro SERVER_IS_DOWN
return (m_server_base->pending_status & SERVER_RUNNING) == 0;
return status_is_down(m_server_base->pending_status);
}
bool MariaDBServer::is_in_maintenance() const
{
return m_server_base->pending_status & SERVER_MAINT;
return status_is_in_maint(m_server_base->pending_status);
}
bool MariaDBServer::is_relay_master() const
{
return (m_server_base->pending_status & (SERVER_RUNNING | SERVER_RELAY_MASTER | SERVER_MAINT)) ==
(SERVER_RUNNING | SERVER_RELAY_MASTER);
return status_is_relay(m_server_base->pending_status);
}
bool MariaDBServer::has_status(uint64_t bits) const