[Tarantool-patches] [PATCH] vinyl: prohibit vinyl_level_size_ratio less than two

Maksim Kulis bokuno at picodata.io
Mon Dec 2 19:11:28 MSK 2019


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



More information about the Tarantool-patches mailing list