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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Esa Korhonen
2019-06-19 17:26:40 +03:00
parent 0ff065c4eb 39df829384
commit 5528a8e8fb
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -571,7 +571,7 @@ uint32_t MariaDBMonitor::do_rejoin(const ServerArray& joinable_servers, json_t**
// Assume that server is an old master which was failed over. Even if this is not really
// the case, the following is unlikely to do damage.
ServerOperation demotion(joinable, true);
if (joinable->demote(general, demotion))
if (joinable->demote(general, demotion, OperationType::REJOIN))
{
MXS_NOTICE("Directing standalone server '%s' to replicate from '%s'.", name, master_name);
// A slave connection description is required. As this is the only connection, no name
@ -772,7 +772,7 @@ bool MariaDBMonitor::switchover_perform(SwitchoverParams& op)
bool rval = false;
// Step 1: Set read-only to on, flush logs, update gtid:s.
if (demotion_target->demote(op.general, op.demotion))
if (demotion_target->demote(op.general, op.demotion, OperationType::SWITCHOVER))
{
m_cluster_modified = true;
bool catchup_and_promote_success = false;