From 1034641fa54f9a4e0c9c243355acb8c139d4e370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 28 Jul 2017 11:30:07 +0300 Subject: [PATCH] MXS-1317: Change default for monitor_interval to 2000 The default value for monitor_interval is now 2000 milliseconds. --- Documentation/Monitors/Monitor-Common.md | 8 +++++++- .../Release-Notes/MaxScale-2.2.0-Release-Notes.md | 5 +++++ server/core/maxscale/monitor.h | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Documentation/Monitors/Monitor-Common.md b/Documentation/Monitors/Monitor-Common.md index f71918bdb..d1258a50f 100644 --- a/Documentation/Monitors/Monitor-Common.md +++ b/Documentation/Monitors/Monitor-Common.md @@ -16,7 +16,13 @@ the `monitorpw` parameter, that value will be used instead. ### `monitor_interval` -This is the time the monitor waits between each cycle of monitoring. The default value of 10000 milliseconds (10 seconds) should be lowered if you want a faster response to changes in the server states. The value is defined in milliseconds and the smallest possible value is 100 milliseconds. +This is the time the monitor waits between each cycle of monitoring. The default +value of 2000 milliseconds (2 seconds) should be lowered if you want a faster +response to changes in the server states. The value is defined in milliseconds +and the smallest possible value is 100 milliseconds. + +The default value of _monitor_interval_ was updated from 10000 milliseconds to +2000 milliseconds in MaxScale 2.2.0. ``` monitor_interval=2500 diff --git a/Documentation/Release-Notes/MaxScale-2.2.0-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.2.0-Release-Notes.md index cfdefa8cc..c6d050e70 100644 --- a/Documentation/Release-Notes/MaxScale-2.2.0-Release-Notes.md +++ b/Documentation/Release-Notes/MaxScale-2.2.0-Release-Notes.md @@ -32,6 +32,11 @@ string parameter and are removed before compiling the pattern. For backwards compatibility, the slashes are not yet mandatory. Omitting them is, however, deprecated and will be rejected in the next release of MaxScale. +### `monitor_interval` + +The default value of `monitor_interval` was changed from 10000 milliseconds to +2000 milliseconds. + ### NamedServerFilter The filter now accepts multiple match-server pairs. Please see the diff --git a/server/core/maxscale/monitor.h b/server/core/maxscale/monitor.h index c9229258e..e859cc0e7 100644 --- a/server/core/maxscale/monitor.h +++ b/server/core/maxscale/monitor.h @@ -27,7 +27,7 @@ MXS_BEGIN_DECLS #define DEFAULT_WRITE_TIMEOUT 2 #define DEFAULT_CONNECTION_ATTEMPTS 1 -#define MONITOR_DEFAULT_INTERVAL 10000 // in milliseconds +#define MONITOR_DEFAULT_INTERVAL 2000 // in milliseconds /** * Monitor network timeout types