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

User friendly bit mask display for DCB print; monitors to work via inserting hangups instead of callbacks.

Browse Source
This commit is contained in:
counterpoint
2015-10-17 20:00:05 +01:00
parent 57f5dd15bc
commit 482db5e84d
7 changed files with 152 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/monitor/galeramon.c
View File

@ -35,6 +35,7 @@
* 20/04/15 Guillaume Lefranc Added availableWhenDonor feature
* 22/04/15 Martin Brampton Addition of disableMasterRoleSetting
* 08/05/15 Markus Makela Addition of launchable scripts
* 17/10/15 Martin Brampton Change DCB callback to hangup
*
* @endverbatim
*/
@ -541,13 +542,13 @@ monitor_event_t evtype;
if (!(SERVER_IS_RUNNING(ptr->server)) ||
!(SERVER_IS_IN_CLUSTER(ptr->server)))
{
dcb_call_foreach(ptr->server,DCB_REASON_NOT_RESPONDING);
dcb_hangup_foreach(ptr->server);
}
if (SERVER_IS_DOWN(ptr->server))
{
/** Increase this server'e error count */
dcb_call_foreach(ptr->server,DCB_REASON_NOT_RESPONDING);
dcb_hangup_foreach(ptr->server);
ptr->mon_err_count += 1;
}

3
server/modules/monitor/mmmon.c
View File

@ -25,6 +25,7 @@
* Date Who Description
* 08/09/14 Massimiliano Pinto Initial implementation
* 08/05/15 Markus Makela Addition of launchable scripts
* 17/10/15 Martin Brampton Change DCB callback to hangup
*
* @endverbatim
*/
@ -625,7 +626,7 @@ detect_stale_master = handle->detectStaleMaster;
if (mon_status_changed(ptr))
{
dcb_call_foreach(ptr->server,DCB_REASON_NOT_RESPONDING);
dcb_hangup_foreach(ptr->server);
}
if (mon_status_changed(ptr) ||

4
server/modules/monitor/mysql_mon.c
View File

@ -47,6 +47,7 @@
* 18/11/14 Massimiliano Pinto One server only in configuration becomes master.
* servers=server1 must be present in mysql_mon and in router sections as well.
* 08/05/15 Markus Makela Added launchable scripts
* 17/10/15 Martin Brampton Change DCB callback to hangup
*
* @endverbatim
*/
@ -861,8 +862,7 @@ detect_stale_master = handle->detectStaleMaster;
if (!(SERVER_IS_RUNNING(ptr->server)) ||
!(SERVER_IS_IN_CLUSTER(ptr->server)))
{
dcb_call_foreach(ptr->server,DCB_REASON_NOT_RESPONDING);
dcb_hangup_foreach(ptr->server);
}