From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp39.i.mail.ru (smtp39.i.mail.ru [94.100.177.99]) (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 DF50D46971A for ; Mon, 2 Dec 2019 19:11:39 +0300 (MSK) From: Maksim Kulis Date: Mon, 2 Dec 2019 19:11:28 +0300 Message-Id: <20191202161128.20890-1-bokuno@picodata.io> Subject: [Tarantool-patches] [PATCH] vinyl: prohibit vinyl_level_size_ratio less than two List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Change the minimum possible value of the variable vinyl_run_size_ratio to 2. Closes #3346 --- src/box/box.cc | 4 ++-- test/box-tap/cfg.test.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/box/box.cc b/src/box/box.cc index be2390335..e426fdab8 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -589,9 +589,9 @@ box_check_vinyl_options(void) tnt_raise(ClientError, ER_CFG, "vinyl_run_count_per_level", "must be greater than 0"); } - if (run_size_ratio <= 1) { + if (run_size_ratio < 2) { tnt_raise(ClientError, ER_CFG, "vinyl_run_size_ratio", - "must be greater than 1"); + "must be greater than or uqual to 2"); } if (bloom_fpr <= 0 || bloom_fpr > 1) { tnt_raise(ClientError, ER_CFG, "vinyl_bloom_fpr", diff --git a/test/box-tap/cfg.test.lua b/test/box-tap/cfg.test.lua index d529447bb..b68c6f17b 100755 --- a/test/box-tap/cfg.test.lua +++ b/test/box-tap/cfg.test.lua @@ -46,7 +46,7 @@ invalid('vinyl_read_threads', 0) invalid('vinyl_write_threads', 1) invalid('vinyl_page_size', 0) invalid('vinyl_run_count_per_level', 0) -invalid('vinyl_run_size_ratio', 1) +invalid('vinyl_run_size_ratio', 1.9) invalid('vinyl_bloom_fpr', 0) invalid('vinyl_bloom_fpr', 1.1) -- 2.17.1