caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve stability of new CSC eviction test (#8160)

Browse Source 
c4fdf09c0 added a test that now fails with valgrind
it fails for two resons:
1) the test samples the used memory and then limits the maxmemory to
   that value, but it turns out this is not atomic and on slow machines
   the background cron process that clean out old query buffers reduces
   the memory so that the setting doesn't cause eviction.
2) the dbsize was tested late, after reading some invalidation messages
   by that time more and more keys got evicted, partially draining the
   db. this is not the focus of this fix (still a known limitation)
This commit is contained in:
Oran Agra 2020-12-08 16:33:09 +02:00 committed by GitHub
parent 1acc315cea
commit a102b21d17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/unit/maxmemory.tcl
View File

@ -291,6 +291,11 @@ start_server {tags {"maxmemory"}} {
} }
} }
# we need to wait one second for the client querybuf excess memory to be
# trimmed by cron, otherwise the INFO used_memory and CONFIG maxmemory
# below (on slow machines) won't be "atomic" and won't trigger eviction.
after 1100
# set the memory limit which will cause a few keys to be evicted # set the memory limit which will cause a few keys to be evicted
# we need to make sure to evict keynames of a total size of more than # we need to make sure to evict keynames of a total size of more than
# 16kb since the (PROTO_REPLY_CHUNK_BYTES), only after that the # 16kb since the (PROTO_REPLY_CHUNK_BYTES), only after that the
@ -302,13 +307,20 @@ start_server {tags {"maxmemory"}} {
# make sure some eviction happened # make sure some eviction happened
set evicted [s evicted_keys] set evicted [s evicted_keys]
if {$::verbose} { puts "evicted: $evicted" } if {$::verbose} { puts "evicted: $evicted" }
# make sure we didn't drain the database
assert_range [r dbsize] 200 300
assert_range $evicted 10 50 assert_range $evicted 10 50
foreach rd $clients { foreach rd $clients {
$rd read ;# make sure we have some invalidation message waiting $rd read ;# make sure we have some invalidation message waiting
$rd close $rd close
} }
# make sure we didn't drain the database # eviction continues (known problem described in #8069)
assert_range [r dbsize] 200 300 # for now this test only make sures the eviction loop itself doesn't
# have feedback loop
set evicted [s evicted_keys]
if {$::verbose} { puts "evicted: $evicted" }
} }
} }