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

MXS-2332 When server is drained, report it as such

Browse Source 
When the SERVER_BEING_DRAINED bit is on, if the number of connections
to the server is 0, the state is reported as "Drained", otherwise as
"Being Drained".
This commit is contained in:
Johan Wikman
2019-02-15 11:01:51 +02:00
parent f1dcc4ac98
commit daf5c6b29c
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/core/server.cc
View File

@ -611,7 +611,7 @@ void Server::dListServers(DCB* dcb)
}
}
string SERVER::status_to_string(uint64_t flags)
string SERVER::status_to_string(uint64_t flags, int nConnections)
{
string result;
string separator;
@ -630,6 +630,7 @@ string SERVER::status_to_string(uint64_t flags)
// should not change, but this is more dependant on the monitors and have already changed.
// Also, system tests compare to these strings so the output must stay constant for now.
const string maintenance = "Maintenance";
const string drained = "Drained";
const string being_drained = "Being Drained";
const string master = "Master";
const string relay = "Relay Master";
@ -651,7 +652,14 @@ string SERVER::status_to_string(uint64_t flags)
}
else if (status_is_being_drained(flags))
{
concatenate_if(true, being_drained);
if (nConnections == 0)
{
concatenate_if(true, drained);
}
else
{
concatenate_if(true, being_drained);
}
}
// Master cannot be a relay or a slave.
@ -684,7 +692,7 @@ string SERVER::status_to_string(uint64_t flags)
string SERVER::status_string() const
{
return status_to_string(status);
return status_to_string(status, stats.n_current);
}
void SERVER::set_status(uint64_t bit)