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

MXS-2339 A running Clustrix node is regarded as master

Browse Source 
In this context master should be interpreted as "can be read
and written to".

Marking them as master requires less changes in RWS to make it
usable with a Clustrix cluster.
This commit is contained in:
Johan Wikman 2019-03-26 16:34:12 +02:00
parent ab96606269
commit 84bf241dd1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/monitor/clustrixmon/clustrixmonitor.cc
View File

@ -581,16 +581,16 @@ void ClustrixMonitor::update_server_statuses()
if (info.is_running())
{
ms->set_pending_status(SERVER_RUNNING);
ms->set_pending_status(SERVER_MASTER | SERVER_RUNNING);
}
else
{
ms->clear_pending_status(SERVER_RUNNING);
ms->clear_pending_status(SERVER_MASTER | SERVER_RUNNING);
}
}
else
{
ms->clear_pending_status(SERVER_RUNNING);
ms->clear_pending_status(SERVER_MASTER | SERVER_RUNNING);
}
}
}

4
server/modules/monitor/clustrixmon/clustrixnode.hh
View File

@ -125,7 +125,7 @@ public:
{
m_nRunning = m_health_check_threshold;
m_pServer->set_status(SERVER_RUNNING);
m_pServer->set_status(SERVER_MASTER | SERVER_RUNNING);
}
else
{
@ -142,7 +142,7 @@ public:
if (m_nRunning == 0)
{
m_pServer->clear_status(SERVER_RUNNING);
m_pServer->clear_status(SERVER_MASTER | SERVER_RUNNING);
}
}
}