From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <korablev@tarantool.org>
Received: from smtp5.mail.ru (smtp5.mail.ru [94.100.179.24])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id 48944469719
 for <tarantool-patches@dev.tarantool.org>;
 Fri, 20 Mar 2020 16:56:23 +0300 (MSK)
Date: Fri, 20 Mar 2020 13:56:22 +0000
From: Nikita Pettik <korablev@tarantool.org>
Message-ID: <20200320135622.GB14930@tarantool.org>
References: <cover.1583366981.git.v.shpilevoy@tarantool.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <cover.1583366981.git.v.shpilevoy@tarantool.org>
Subject: Re: [Tarantool-patches] [PATCH 0/2] box.cfg() check
	memtx/vinyl_memory
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org

On 05 Mar 01:14, Vladislav Shpilevoy wrote:
> The patchset fixes
> 1) forgotten diag_raise() for sql cache size check;
> 2) assertion when memtx_memory is too big.
> 
> Branch: http://github.com/tarantool/tarantool/tree/gerold103/gh-4705-memtx-memory-too-big
> Issue: https://github.com/tarantool/tarantool/issues/4705
> 
> @ChangeLog
> - It is not possible to set memtx_memory and vinyl_memory more
>   than 4398046510080 bytes now (gh-4705).

Pushed first patch to master and 2.3, second one to master, 2.3 and 2.2.
Updated changelogs correspondingly. Branch is dropped.
 
> Vladislav Shpilevoy (2):
>   box: fail in box_check_config() on bad sql cache size
>   box: on cfg properly check memory quota
> 
>  src/box/box.cc        | 49 +++++++++++++++++++++----------------------
>  test/box/cfg.result   | 19 +++++++++++++++--
>  test/box/cfg.test.lua |  5 +++++
>  3 files changed, 46 insertions(+), 27 deletions(-)
> 
> -- 
> 2.21.1 (Apple Git-122.3)
>