From dbe94e2dbe334ab76b2a030362b05d0b9cea505a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 27 Aug 2020 08:20:16 +0300 Subject: [PATCH] MXS-3132: Fix monitor timeouts default values The values are now what the documentation states they are. --- Documentation/Monitors/Monitor-Common.md | 11 +++++------ server/core/config.cc | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Documentation/Monitors/Monitor-Common.md b/Documentation/Monitors/Monitor-Common.md index a4371025a..5a8d4d99e 100644 --- a/Documentation/Monitors/Monitor-Common.md +++ b/Documentation/Monitors/Monitor-Common.md @@ -27,8 +27,7 @@ should be queried more often. The smallest possible value is 100. If querying the servers takes longer than `monitor_interval`, the effective update rate is reduced. -The default value of `monitor_interval` was updated from 10000 milliseconds to -2000 milliseconds in MaxScale 2.2.0. +The default value of `monitor_interval` is 2000 milliseconds. ``` monitor_interval=2500 @@ -41,7 +40,7 @@ in seconds and the minimum value is 1 second. The default value for this parameter is 3 seconds. ``` -backend_connect_timeout=6 +backend_connect_timeout=3 ``` ### `backend_write_timeout` @@ -51,7 +50,7 @@ seconds and the minimum value is 1 second. The default value for this parameter is 3 seconds. ``` -backend_write_timeout=4 +backend_write_timeout=3 ``` ### `backend_read_timeout` @@ -61,7 +60,7 @@ in seconds and the minimum value is 1 second. The default value for this parameter is 3 seconds. ``` -backend_read_timeout=2 +backend_read_timeout=3 ``` ### `backend_connect_attempts` @@ -72,7 +71,7 @@ monitoring loop. The default is 1. Every attempt may take up to successful, the backend is considered to be unreachable and down. ``` -backend_connect_attempts=3 +backend_connect_attempts=1 ``` ### `disk_space_threshold` diff --git a/server/core/config.cc b/server/core/config.cc index 073b53ad4..47a5a5958 100644 --- a/server/core/config.cc +++ b/server/core/config.cc @@ -361,8 +361,8 @@ const MXS_MODULE_PARAM config_monitor_params[] = {CN_SERVERS, MXS_MODULE_PARAM_STRING}, {CN_MONITOR_INTERVAL, MXS_MODULE_PARAM_COUNT, "2000"}, {CN_BACKEND_CONNECT_TIMEOUT, MXS_MODULE_PARAM_COUNT, "3"}, - {CN_BACKEND_READ_TIMEOUT, MXS_MODULE_PARAM_COUNT, "1"}, - {CN_BACKEND_WRITE_TIMEOUT, MXS_MODULE_PARAM_COUNT, "2"}, + {CN_BACKEND_READ_TIMEOUT, MXS_MODULE_PARAM_COUNT, "3"}, + {CN_BACKEND_WRITE_TIMEOUT, MXS_MODULE_PARAM_COUNT, "3"}, {CN_BACKEND_CONNECT_ATTEMPTS, MXS_MODULE_PARAM_COUNT, "1"}, {CN_JOURNAL_MAX_AGE, MXS_MODULE_PARAM_COUNT, "28800"},