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

MXS-1944 Store failover parameters in an object

Browse Source 
Several of the parameters are passed on from function to function. Having them all
in an object cleans things up and makes adding more data easier.
This commit is contained in:
Esa Korhonen
2018-09-17 10:26:06 +03:00
parent 92832c1ec4
commit c20a17238b
6 changed files with 125 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1030,7 +1030,7 @@ bool MariaDBServer::can_be_demoted_failover(string* reason_out)
return demotable;
}
bool MariaDBServer::can_be_promoted(ClusterOperation op,
bool MariaDBServer::can_be_promoted(OperationType op,
const MariaDBServer* demotion_target,
std::string* reason_out)
{
@ -1051,7 +1051,7 @@ bool MariaDBServer::can_be_promoted(ClusterOperation op,
{
reason = string_printf("its slave connection to '%s' is not using gtid.", demotion_target->name());
}
else if (op == ClusterOperation::SWITCHOVER && sstatus->slave_io_running != SlaveStatus::SLAVE_IO_YES)
else if (op == OperationType::SWITCHOVER && sstatus->slave_io_running != SlaveStatus::SLAVE_IO_YES)
{
reason = string_printf("its slave connection to '%s' is broken.", demotion_target->name());
}