diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua index 55ee8e14fdada0b749ba62297ed5873f90e3231a..dd93c9a6c286e398710e969c2d5c02d7d90cc5ae 100644 --- a/src/box/lua/load_cfg.lua +++ b/src/box/lua/load_cfg.lua @@ -31,7 +31,7 @@ local default_cfg = { slab_alloc_arena = 1.0, slab_alloc_minimal = 64, slab_alloc_maximal = 1024 * 1024, - slab_alloc_factor = 2.0, + slab_alloc_factor = 1.1, work_dir = nil, snap_dir = ".", wal_dir = ".", diff --git a/test/app/float_value.result b/test/app/float_value.result index 603693b2eb4e91d105d1a9b5b48478f73cfc4882..f592757013664b3edab859e613102ffcabc88a88 100644 --- a/test/app/float_value.result +++ b/test/app/float_value.result @@ -1,7 +1,7 @@ box.cfg 1 snapshot_count:6 2 pid_file:box.pid -3 slab_alloc_factor:2 +3 slab_alloc_factor:1.1 4 rows_per_wal:50 5 background:false 6 logger:tarantool.log diff --git a/test/app/init_script.result b/test/app/init_script.result index b1cac69abde02e98401dba09c5887359b74309ac..03ef3f3517410971252831ec43c0bbcb6899bec2 100644 --- a/test/app/init_script.result +++ b/test/app/init_script.result @@ -5,7 +5,7 @@ box.cfg 1 snapshot_count:6 2 pid_file:box.pid -3 slab_alloc_factor:2 +3 slab_alloc_factor:1.1 4 slab_alloc_maximal:1048576 5 background:false 6 logger:tarantool.log diff --git a/test/box/admin.result b/test/box/admin.result index 973347aa1bf609cbebd3b827727fad26fa23c4a6..30217aee9a5eb3ee37f3f58fc503faebccd5c6c8 100644 --- a/test/box/admin.result +++ b/test/box/admin.result @@ -20,7 +20,7 @@ box.cfg --- - snapshot_count: 6 too_long_threshold: 0.5 - slab_alloc_factor: 2 + slab_alloc_factor: 1.1 slab_alloc_maximal: 1048576 background: false slab_alloc_arena: 0.1 diff --git a/test/box/cfg.result b/test/box/cfg.result index fc615be3ed65375fb4c314c964cfb8460d8efa40..bab6b13c6faaf3f2946f6bd057ae1b0d58f6e06a 100644 --- a/test/box/cfg.result +++ b/test/box/cfg.result @@ -12,7 +12,7 @@ t --- - - 'snapshot_count: 6' - 'too_long_threshold: 0.5' - - 'slab_alloc_factor: 2' + - 'slab_alloc_factor: 1.1' - 'slab_alloc_maximal: 1048576' - 'background: false' - 'slab_alloc_arena: 0.1' @@ -46,7 +46,7 @@ t --- - - 'snapshot_count: 6' - 'too_long_threshold: 0.5' - - 'slab_alloc_factor: 2' + - 'slab_alloc_factor: 1.1' - 'slab_alloc_maximal: 1048576' - 'background: false' - 'slab_alloc_arena: 0.1' @@ -117,7 +117,7 @@ box.cfg{sophia = {threads = "threads"}} box.cfg.slab_alloc_arena, box.cfg.slab_alloc_factor, box.cfg.sophia.threads, box.cfg.sophia.page_size --- - 1 -- 2 +- 1.1 - 5 - 131072 ... @@ -132,7 +132,7 @@ box.cfg.slab_alloc_arena, box.cfg.slab_alloc_factor, box.cfg.sophia.threads, box box.cfg.slab_alloc_arena, box.cfg.slab_alloc_factor, box.cfg.sophia.threads, box.cfg.sophia.page_size --- - 0.2 -- 2 +- 1.1 - 5 - 131072 ... @@ -147,7 +147,7 @@ box.cfg.slab_alloc_arena, box.cfg.slab_alloc_factor, box.cfg.sophia.threads, box box.cfg.slab_alloc_arena, box.cfg.slab_alloc_factor, box.cfg.sophia.threads, box.cfg.sophia.page_size --- - 0.2 -- 2 +- 1.1 - 10 - 131072 ... diff --git a/test/wal_off/oom.result b/test/wal_off/oom.result index d029f0225265480aef57dafc68812c0fddc0686e..4619a92bebec234a0a9fde5c86725e68e0698ce8 100644 --- a/test/wal_off/oom.result +++ b/test/wal_off/oom.result @@ -15,11 +15,11 @@ while true do i = i + 1 end; --- -- error: Failed to allocate 22911 bytes in slab allocator for tuple +- error: Failed to allocate 24643 bytes in slab allocator for tuple ... space:len(); --- -- 5722 +- 6155 ... i = 1; --- @@ -29,11 +29,11 @@ while true do i = i + 1 end; --- -- error: Failed to allocate 4203 bytes in slab allocator for tuple +- error: Failed to allocate 5187 bytes in slab allocator for tuple ... space:len(); --- -- 6767 +- 7446 ... i = 1; --- @@ -43,12 +43,12 @@ while true do i = i + 1 end; --- -- error: Failed to allocate 1043 bytes in slab allocator for tuple +- error: Failed to allocate 2751 bytes in slab allocator for tuple ... --# setopt delimiter '' space:len() --- -- 7022 +- 8128 ... space.index['primary']:get{0} ---