From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vdavydov.dev@gmail.com>
Date: Fri, 15 Mar 2019 17:12:19 +0300
From: Vladimir Davydov <vdavydov.dev@gmail.com>
Subject: Re: [PATCH] vinyl: reset dump watermark after updating memory limit
Message-ID: <20190315141219.d6nyn5cl4gzoqkcb@esperanza>
References: <b15773fae61d31d5aa8a586ed4d816632fd1bd4a.1552659087.git.vdavydov.dev@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <b15773fae61d31d5aa8a586ed4d816632fd1bd4a.1552659087.git.vdavydov.dev@gmail.com>
To: tarantool-patches@freelists.org
List-ID: <tarantool-patches.dev.tarantool.org>

On Fri, Mar 15, 2019 at 05:11:51PM +0300, Vladimir Davydov wrote:
> The watermark is updated every second anyway, however not updating it
> when the limit is reset results in vinyl/quota test failure:
> 
>  | --- vinyl/quota.result  Thu Mar 14 16:03:54 2019
>  | +++ vinyl/quota.reject  Fri Mar 15 16:32:44 2019
>  | @@ -146,7 +146,7 @@
>  |  for i = 1, count do s:replace{i, pad} end -- does not trigger dump
>  |  ---
>  |  ...
>  | -box.stat.vinyl().memory.level0 > count * pad:len()
>  | +box.stat.vinyl().memory.level0 > count * pad:len() or box.stat.vinyl()
>  |  ---
>  |  - true
>  |  ...
> 
> Closes #3864
> ---
> https://github.com/tarantool/tarantool/issues/3864
> 
>  src/box/vinyl.c        | 2 +-
>  src/box/vy_regulator.c | 7 +++++++
>  src/box/vy_regulator.h | 6 ++++++
>  3 files changed, 14 insertions(+), 1 deletion(-)

Trivial. Pushed to 2.1.