From c04073a96c1a797746506c9faa2962c641b7149e Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Mon, 10 Sep 2018 16:05:33 +0300 Subject: [PATCH] MXS-2040 Increase default monitor timeouts All three timeouts are now three seconds. This should reduce the amount of timeout errors users get during failover/switchover. --- Documentation/Monitors/Monitor-Common.md | 12 +++++++++--- server/core/internal/monitor.h | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Documentation/Monitors/Monitor-Common.md b/Documentation/Monitors/Monitor-Common.md index f85c1a546..cd57ec405 100644 --- a/Documentation/Monitors/Monitor-Common.md +++ b/Documentation/Monitors/Monitor-Common.md @@ -30,7 +30,9 @@ monitor_interval=2500 ### `backend_connect_timeout` -This parameter controls the timeout for connecting to a monitored server. It is in seconds and the minimum value is 1 second. The default value for this parameter is 3 seconds. +This parameter controls the timeout for connecting to a monitored server. It is +in seconds and the minimum value is 1 second. The default value for this +parameter is 3 seconds. ``` backend_connect_timeout=6 @@ -38,7 +40,9 @@ backend_connect_timeout=6 ### `backend_write_timeout` -This parameter controls the timeout for writing to a monitored server. It is in seconds and the minimum value is 1 second. The default value for this parameter is 2 seconds. +This parameter controls the timeout for writing to a monitored server. It is in +seconds and the minimum value is 1 second. The default value for this parameter +is 3 seconds. ``` backend_write_timeout=4 @@ -46,7 +50,9 @@ backend_write_timeout=4 ### `backend_read_timeout` -This parameter controls the timeout for reading from a monitored server. It is in seconds and the minimum value is 1 second. The default value for this parameter is 1 seconds. +This parameter controls the timeout for reading from a monitored server. It is +in seconds and the minimum value is 1 second. The default value for this +parameter is 3 seconds. ``` backend_read_timeout=2 diff --git a/server/core/internal/monitor.h b/server/core/internal/monitor.h index 319219251..74d97d65e 100644 --- a/server/core/internal/monitor.h +++ b/server/core/internal/monitor.h @@ -24,8 +24,8 @@ MXS_BEGIN_DECLS #define MON_ARG_MAX 8192 #define DEFAULT_CONNECT_TIMEOUT 3 -#define DEFAULT_READ_TIMEOUT 1 -#define DEFAULT_WRITE_TIMEOUT 2 +#define DEFAULT_READ_TIMEOUT 3 +#define DEFAULT_WRITE_TIMEOUT 3 #define DEFAULT_CONNECTION_ATTEMPTS 1 #define DEFAULT_MONITOR_INTERVAL 2000 // in milliseconds