From 0862c724d8782e681e4dc833b9a22cf94c3696fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 19 Oct 2018 11:26:03 +0300 Subject: [PATCH] Fix writeq_low_water The value was never updated. Also amended the documentation to point out that the parameter accepts size type values. --- Documentation/Getting-Started/Configuration-Guide.md | 6 +++--- server/core/config.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/Getting-Started/Configuration-Guide.md b/Documentation/Getting-Started/Configuration-Guide.md index 65f5f4cae..7c83e68e9 100644 --- a/Documentation/Getting-Started/Configuration-Guide.md +++ b/Documentation/Getting-Started/Configuration-Guide.md @@ -722,7 +722,7 @@ than `0`, this configuration setting will not have an effect. #### `writeq_high_water` High water mark for network write buffer. Controls when network traffic -throtting is started. +throtting is started. The parameter accepts size type values. More specifically, if the client side write queue is above this value, it will block traffic coming from backend servers. If the backend side write queue is @@ -736,8 +736,8 @@ throtting is enabled. By default, traffic throttling is disabled. Low water mark for network write buffer. Once the traffic throttling is enabled, it will only be disabled when the write queue is below `writeq_high_water`. The -minimum allowed size is 512 bytes. `writeq_high_water` must always be greater -than `writeq_low_water`. +parameter accepts size type values. The minimum allowed size is 512 +bytes. `writeq_high_water` must always be greater than `writeq_low_water`. ### REST API Configuration diff --git a/server/core/config.cc b/server/core/config.cc index 5e81cdcb7..0b2a19a87 100644 --- a/server/core/config.cc +++ b/server/core/config.cc @@ -2500,9 +2500,9 @@ static int handle_global_item(const char* name, const char* value) } else if (strcmp(name, CN_WRITEQ_LOW_WATER) == 0) { - if (!get_suffixed_size(value, &gateway.writeq_high_water)) + if (!get_suffixed_size(value, &gateway.writeq_low_water)) { - MXS_ERROR("Invalid value for %s: %s", CN_WRITEQ_HIGH_WATER, value); + MXS_ERROR("Invalid value for %s: %s", CN_WRITEQ_LOW_WATER, value); return 0; }