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

MXS-831: Detect new_master events

Browse Source 
The new_master events were mistakenly detected as lost_slave events.
This commit is contained in:
Markus Makela
2016-09-26 15:05:08 +03:00
parent fa2a667195
commit c470813762
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/monitor.c
View File

@ -711,8 +711,14 @@ mon_get_event_type(MONITOR_SERVERS* node)
} }
else else
{ {
/** These are used to detect whether we actually lost something or
* just transitioned from one state to another */
unsigned int prev_bits = prev & (SERVER_MASTER | SERVER_SLAVE);
unsigned int present_bits = present & (SERVER_MASTER | SERVER_SLAVE);
/* Was running and still is */ /* Was running and still is */
if (prev & (SERVER_MASTER | SERVER_SLAVE | SERVER_JOINED | SERVER_NDB)) if ((!prev_bits || !present_bits || prev_bits == present_bits) &&
prev & (SERVER_MASTER | SERVER_SLAVE | SERVER_JOINED | SERVER_NDB))
{ {
/* We used to know what kind of server it was */ /* We used to know what kind of server it was */
event_type = LOSS_EVENT; event_type = LOSS_EVENT;