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

Turn server status macros to functions

Browse Source
This commit is contained in:
Esa Korhonen
2018-07-23 15:53:10 +03:00
parent b421e56d1c
commit fbce38878b
19 changed files with 121 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/routing/hintrouter/hintrouter.cc
View File

@ -84,7 +84,7 @@ HintRouterSession* HintRouter::newSession(MXS_SESSION *pSession)
{
if (SERVER_REF_IS_ACTIVE(pSref))
{
if (SERVER_IS_MASTER(pSref->server))
if (server_is_master(pSref->server))
{
if (!master_ref)
{
@ -95,7 +95,7 @@ HintRouterSession* HintRouter::newSession(MXS_SESSION *pSession)
MXS_WARNING("Found multiple master servers when creating session.\n");
}
}
else if (SERVER_IS_SLAVE(pSref->server))
else if (server_is_slave(pSref->server))
{
slave_refs.push_back(pSref);
}

8
server/modules/routing/hintrouter/hintroutersession.cc
View File

@ -203,7 +203,7 @@ bool HintRouterSession::route_by_hint(GWBUF* pPacket, HINT* hint, bool print_err
{
bool master_ok = false;
// The master server should be already known, but may have changed
if (m_master.get() && SERVER_IS_MASTER(m_master.server()))
if (m_master.get() && server_is_master(m_master.server()))
{
master_ok = true;
}
@ -315,7 +315,7 @@ bool HintRouterSession::route_to_slave(GWBUF* pPacket, bool print_errors)
for (size_type curr = begin; curr != limit; curr++)
{
Dcb& candidate = m_slaves.at(curr % size);
if (SERVER_IS_SLAVE(candidate.server()))
if (server_is_slave(candidate.server()))
{
HR_DEBUG("Writing packet to slave: '%s'.", candidate.server()->name);
success = candidate.write(pPacket);
@ -390,7 +390,7 @@ void HintRouterSession::update_connections()
iter != m_backends.end(); iter++)
{
SERVER* server = iter->second.get()->server;
if (SERVER_IS_MASTER(server))
if (server_is_master(server))
{
if (!m_master.get())
{
@ -401,7 +401,7 @@ void HintRouterSession::update_connections()
MXS_WARNING("Found multiple master servers when updating connections.");
}
}
else if (SERVER_IS_SLAVE(server))
else if (server_is_slave(server))
{
m_slaves.push_back(iter->second);
}