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

Merge branch 'develop' into MAX-324

Browse Source
This commit is contained in:
Markus Makela
2015-03-05 10:45:48 +02:00
parent 561952e1ea d6da4c7501
commit 880adca73e
57 changed files with 4699 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/monitor/CMakeLists.txt
View File

@ -9,3 +9,8 @@ install(TARGETS galeramon DESTINATION modules)
add_library(ndbclustermon SHARED ndbcluster_mon.c)
target_link_libraries(ndbclustermon log_manager utils)
install(TARGETS ndbclustermon DESTINATION modules)
if(BUILD_MMMON)
add_library(mmmon SHARED mm_mon.c)
target_link_libraries(mmmon log_manager utils)
install(TARGETS mmmon DESTINATION modules)
endif()

1
server/modules/monitor/galera_mon.c
View File

@ -552,6 +552,7 @@ int log_no_members = 1;
if (SERVER_IS_DOWN(ptr->server))
{
/** Increase this server'e error count */
dcb_call_foreach(ptr->server,DCB_REASON_NOT_RESPONDING);
ptr->mon_err_count += 1;
}
else

2
server/modules/monitor/mm_mon.c
View File

@ -635,7 +635,7 @@ size_t nrounds = 0;
if (mon_status_changed(ptr))
{
dcb_call_foreach(DCB_REASON_NOT_RESPONDING);
dcb_call_foreach(ptr->server,DCB_REASON_NOT_RESPONDING);
}
if (mon_status_changed(ptr) ||