Commit Graph

431 Commits

Author SHA1 Message Date
2d600868f5 Added argument substitution to monitor scripts 2015-11-11 21:19:07 +02:00
466224b316 Moved common monitor code to externcmd.c
File existence and permission checks are now done in externcmd_can_execute
2015-11-11 21:19:07 +02:00
dee20fe077 Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111
# Conflicts:
#	server/core/CMakeLists.txt
#	server/core/buffer.c
#	server/core/service.c
#	server/modules/filter/tee.c
#	server/modules/monitor/mysql_mon.c
#	server/modules/routing/binlog/blr.c
#	server/modules/routing/binlog/blr_slave.c
#	server/modules/routing/debugcmd.c
#	server/modules/routing/readwritesplit/readwritesplit.c
#	utils/skygw_utils.cc

- resolved.
2015-11-11 11:08:02 +00:00
834a88aeda Log variables moved to log_manager.h
The log manager variables lm_enabled_log_files_bitmask, log_ses_count
and tls_log_info that earlier were declared separately in every
c-file are now declared in the log_manager.h header.
2015-11-04 14:26:53 +02:00
3187f2c3f8 Updated code based on review of 9a04984 2015-10-31 10:34:37 +02:00
cd55f62051 Fix to MXS-29: https://mariadb.atlassian.net/browse/MXS-29
If MAXSCALE_SCHEMA.REPLICATION_HEARTBEAT isn't replicated, a warning is logged.
2015-10-31 10:34:37 +02:00
91bb3b288c Moved common monitor code to monitor_common.c 2015-10-26 17:31:19 +02:00
2b958bad94 Added detection of connection timeout when monitors connect to backend servers. 2015-10-26 17:30:34 +02:00
6040f11070 Include DCB headers to remove warnings. 2015-10-17 20:06:37 +01:00
482db5e84d User friendly bit mask display for DCB print; monitors to work via inserting hangups instead of callbacks. 2015-10-17 20:00:05 +01:00
6ad89cb986 Removed boolean value assignment to an integer variable. 2015-09-16 13:36:33 +03:00
6c75e09f29 Fixed multi-source replication not working. 2015-09-16 11:54:56 +03:00
3b0b740e47 Fixed monitor scripts and added extra logging. 2015-09-11 18:49:20 +03:00
3e863863dd Fixes to Coverity defects. 2015-08-26 09:35:10 +03:00
c001e030af Fixed available_when_donor not working properly. 2015-08-20 20:33:46 +03:00
a74ed87d07 Removed redundant linking of the utils library. 2015-08-10 10:40:00 +03:00
ba32596603 Fixed MM monitor segfault on crash. 2015-08-07 14:00:55 +03:00
edd2688e71 Fix memory leak in MySQL monitor. 2015-07-19 16:54:13 +01:00
b756690123 Merge branch 'release-1.2' into develop 2015-07-15 11:38:27 +03:00
96edaca90c Disabled C99. 2015-07-14 12:14:01 +03:00
19fe7127d5 Added galeramon server priorities. 2015-07-13 14:39:04 +03:00
2580738509 Merge branch 'develop' into priority_galeramon 2015-07-07 20:45:54 +03:00
058f49eb88 Added error message about MySQL versions lower than 5.5 and monitors without the 'mysql51_replication' enabled. 2015-07-07 20:14:57 +03:00
c8173ec4f7 Added missing return value. 2015-07-02 10:00:38 +03:00
2b0f0b89ab Added master server id to mysql 5.1 monitoring. 2015-07-01 19:13:03 +03:00
8a0b399896 Added code for MySQL 5.1 replication detection. 2015-06-30 21:37:29 +03:00
6f343ff57b Fix to MXS-227: https://mariadb.atlassian.net/browse/MXS-227
Fixed memory leak.
2015-06-29 19:17:12 +03:00
0062d9d2b7 Version errors for SHOW SLAVE STATUS now only print once. 2015-06-29 10:24:16 +03:00
5c7a30e9fe Added more error logging. 2015-06-28 10:43:06 +03:00
113fb4c33b Fix to MXS-209: https://mariadb.atlassian.net/browse/MXS-209
Added missing checks for proper column count on query result.
2015-06-28 08:43:05 +03:00
e5d9abbdcb Fixes to Coverity defects. 2015-06-25 06:01:33 +03:00
c3aa5beeb4 Added missing initialization from MM monitor. 2015-06-21 19:32:19 +03:00
f6369a1661 Changed from server unique name to ip:port in monitor script initiaion. 2015-06-18 18:03:55 +03:00
fe2062b5b0 Fixed a regression in mysql_mon.c which caused a memory leak 2015-06-11 19:50:51 +03:00
3fb1213dee Added more error logging when monitor scripts fail. 2015-06-10 06:09:42 +03:00
5f076b81d4 Merge branch 'install_dir_change' into develop
Conflicts:
	CMakeLists.txt
	Documentation/Tutorials/Administration-Tutorial.md
	log_manager/CMakeLists.txt
	server/core/CMakeLists.txt
	server/core/gateway.c
	server/core/maxkeys.c
	server/core/maxpasswd.c
	server/modules/filter/test/CMakeLists.txt
	server/modules/routing/CMakeLists.txt
2015-05-26 13:34:39 +03:00
9c461450e2 Fixes to Coverity defects. 2015-05-22 05:36:58 +03:00
ac55f7c6fe Merge branch 'MXS-121' into develop 2015-05-21 17:53:01 +03:00
3301ffc76d Added different log message when the script is missing for a monitor. 2015-05-21 17:40:33 +03:00
91bc7b2792 Added missing spinlock calls to all monitors. 2015-05-21 11:41:11 +03:00
7dbc021149 Added more logging when a monitor script cannot be executed. 2015-05-20 16:16:49 +03:00
8f20d23d4c Added missing function prototype to mmmon.c 2015-05-19 19:20:59 +03:00
c4f51c0b8c Fixed a possible bug with multiple monitors monitoring the same servers. 2015-05-19 15:42:11 +03:00
1403b3dfeb Fixed old header names form monitor_common.h 2015-05-19 14:40:24 +03:00
a73df62ebd Renamed mon_exec files to externcmd. 2015-05-18 18:34:43 +03:00
b94f494d80 Added filtering of monitor events. 2015-05-14 12:05:58 +03:00
1aba13177b Added ndbclustermon and mmmon headers. 2015-05-11 20:35:54 +03:00
1d0740c1c1 Renamed node to initiator in the arguments a monitor calls the script. 2015-05-09 21:16:35 +03:00
9845923f81 Added full implementation of MXS-121 to all monitors. 2015-05-09 17:37:34 +03:00
0c15812340 Moved common functions to monitor_common.c 2015-05-09 14:29:26 +03:00