Merge branch '2.3' into 2.4

2020-08-27 15:21:36 +03:00
parent 7b9f852b9c 24d6a582c2
commit bce427f4ad
5 changed files with 64 additions and 93 deletions
--- a/server/core/config.cc
+++ b/server/core/config.cc
@ -542,13 +542,13 @@ const MXS_MODULE_PARAM config_monitor_params[] =
    {
        CN_BACKEND_READ_TIMEOUT,
        MXS_MODULE_PARAM_DURATION,
-        "1s",
+        "3s",
        MXS_MODULE_OPT_DURATION_S
    },
    {
        CN_BACKEND_WRITE_TIMEOUT,
        MXS_MODULE_PARAM_DURATION,
-        "2s",
+        "3s",
        MXS_MODULE_OPT_DURATION_S
    },
    {