MXS-1937 Enable server events on new master during switchover and failover

Combined some of the shared code in enable/disable_events(). Also disables
events on a joining standalone server.
This commit is contained in:
Esa Korhonen
2018-09-03 16:29:43 +03:00
parent 7e6ce2d13f
commit f3fbb297a4
3 changed files with 126 additions and 46 deletions

View File

@ -311,7 +311,7 @@ uint32_t MariaDBMonitor::do_rejoin(const ServerArray& joinable_servers, json_t**
else
{
MXS_NOTICE("Directing standalone server '%s' to replicate from '%s'.", name, master_name);
op_success = joinable->join_cluster(change_cmd);
op_success = joinable->join_cluster(change_cmd, m_handle_event_scheduler);
}
}
else