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

MXS-2556 Use configured master

Browse Source
This commit is contained in:
Johan Wikman
2019-06-11 12:07:27 +03:00
parent ba4099799f
commit 40851f8a30
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server/modules/routing/smartrouter/smartsession.cc
View File

@ -122,10 +122,9 @@ SmartRouterSession* SmartRouterSession::create(SmartRouter* pRouter, MXS_SESSION
Clusters clusters; Clusters clusters;
SERVER* pMaster = pRouter->config().master(); SERVER* pMaster = pRouter->config().master();
// TODO: Use pMaster below.
bool is_master = true; // TODO this will be read from config int master_pos = -1;
int master_pos = 0; // and this will be initialized to the position of the master int i = 0;
for (SERVER_REF* ref = pRouter->service()->dbref; ref; ref = ref->next) for (SERVER_REF* ref = pRouter->service()->dbref; ref; ref = ref->next)
{ {
@ -139,17 +138,35 @@ SmartRouterSession* SmartRouterSession::create(SmartRouter* pRouter, MXS_SESSION
DCB* dcb = dcb_connect(ref->server, pSession, ref->server->protocol().c_str()); DCB* dcb = dcb_connect(ref->server, pSession, ref->server->protocol().c_str());
if (dcb) if (dcb)
{ {
bool is_master = (ref->server == pMaster);
clusters.push_back({ref, dcb, is_master}); clusters.push_back({ref, dcb, is_master});
is_master = false; // TODO, will come from config, there must be exactly one!
if (is_master)
{
master_pos = i;
}
++i;
} }
} }
if (master_pos) SmartRouterSession* pSess = nullptr;
if (master_pos != -1)
{
if (master_pos > 0)
{ // put the master first. There must be exactly one master cluster. { // put the master first. There must be exactly one master cluster.
std::swap(clusters[0], clusters[master_pos]); std::swap(clusters[0], clusters[master_pos]);
} }
SmartRouterSession* pSess = new SmartRouterSession(pRouter, pSession, std::move(clusters)); pSess = new SmartRouterSession(pRouter, pSession, std::move(clusters));
}
else
{
MXS_ERROR("No master found for %s, smartrouter session cannot be created.",
pRouter->config().name().c_str());
}
return pSess; return pSess;
} }