gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated maxmemory tests to account for overhead in new replication backlog behaviour

Browse Source 
Former-commit-id: 4cd197959693dfe4d1497c3f703cf6aaa27d34ad
This commit is contained in:
VivekSainiEQ 2021-05-05 16:37:02 +00:00
parent 33a7b52899
commit eb35d7e9ec
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/unit/maxmemory.tcl
View File

@ -33,7 +33,8 @@ start_server {tags {"maxmemory"}} {
# Get the current memory limit and calculate a new limit. # Get the current memory limit and calculate a new limit.
# We just add 100k to the current memory size so that it is # We just add 100k to the current memory size so that it is
# fast for us to reach that limit. # fast for us to reach that limit.
set used [s used_memory] set overhead [s mem_not_counted_for_evict]
set used [expr [s used_memory] - $overhead]
set limit [expr {$used+100*1024}] set limit [expr {$used+100*1024}]
r config set maxmemory $limit r config set maxmemory $limit
r config set maxmemory-policy $policy r config set maxmemory-policy $policy
@ -42,7 +43,7 @@ start_server {tags {"maxmemory"}} {
while 1 { while 1 {
r setex [randomKey] 10000 x r setex [randomKey] 10000 x
incr numkeys incr numkeys
if {[s used_memory]+4096 > $limit} { if {[expr {[s used_memory] - $overhead + 4096}] > $limit} {
assert {$numkeys > 10} assert {$numkeys > 10}
break break
} }
@ -52,7 +53,8 @@ start_server {tags {"maxmemory"}} {
for {set j 0} {$j < $numkeys} {incr j} { for {set j 0} {$j < $numkeys} {incr j} {
r setex [randomKey] 10000 x r setex [randomKey] 10000 x
} }
assert {[s used_memory] < ($limit+4096)} set used_amt [expr [s used_memory] - $overhead]
assert {$used_amt < ($limit+4096)}
} }
} }
@ -65,7 +67,8 @@ start_server {tags {"maxmemory"}} {
# Get the current memory limit and calculate a new limit. # Get the current memory limit and calculate a new limit.
# We just add 100k to the current memory size so that it is # We just add 100k to the current memory size so that it is
# fast for us to reach that limit. # fast for us to reach that limit.
set used [s used_memory] set overhead [s mem_not_counted_for_evict]
set used [expr [s used_memory] - $overhead]
set limit [expr {$used+100*1024}] set limit [expr {$used+100*1024}]
r config set maxmemory $limit r config set maxmemory $limit
r config set maxmemory-policy $policy r config set maxmemory-policy $policy
@ -74,7 +77,7 @@ start_server {tags {"maxmemory"}} {
while 1 { while 1 {
r set [randomKey] x r set [randomKey] x
incr numkeys incr numkeys
if {[s used_memory]+4096 > $limit} { if {[expr [s used_memory] - $overhead]+4096 > $limit} {
assert {$numkeys > 10} assert {$numkeys > 10}
break break
} }
@ -91,7 +94,7 @@ start_server {tags {"maxmemory"}} {
} }
} }
if {[string match allkeys-* $policy]} { if {[string match allkeys-* $policy]} {
assert {[s used_memory] < ($limit+4096)} assert {[expr [s used_memory] - $overhead] < ($limit+4096)}
} else { } else {
assert {$err == 1} assert {$err == 1}
} }
@ -107,7 +110,8 @@ start_server {tags {"maxmemory"}} {
# Get the current memory limit and calculate a new limit. # Get the current memory limit and calculate a new limit.
# We just add 100k to the current memory size so that it is # We just add 100k to the current memory size so that it is
# fast for us to reach that limit. # fast for us to reach that limit.
set used [s used_memory] set overhead [s mem_not_counted_for_evict]
set used [expr [s used_memory] - $overhead]
set limit [expr {$used+100*1024}] set limit [expr {$used+100*1024}]
r config set maxmemory $limit r config set maxmemory $limit
r config set maxmemory-policy $policy r config set maxmemory-policy $policy
@ -121,7 +125,7 @@ start_server {tags {"maxmemory"}} {
} else { } else {
r set "key:$numkeys" x r set "key:$numkeys" x
} }
if {[s used_memory]+4096 > $limit} { if {[expr [s used_memory] - $overhead]+4096 > $limit} {
assert {$numkeys > 10} assert {$numkeys > 10}
break break
} }
@ -135,7 +139,7 @@ start_server {tags {"maxmemory"}} {
catch {r setex "foo:$j" 10000 x} catch {r setex "foo:$j" 10000 x}
} }
# We should still be under the limit. # We should still be under the limit.
assert {[s used_memory] < ($limit+4096)} assert {[expr [s used_memory] - $overhead] < ($limit+4096)}
# However all our non volatile keys should be here. # However all our non volatile keys should be here.
for {set j 0} {$j < $numkeys} {incr j 2} { for {set j 0} {$j < $numkeys} {incr j 2} {
assert {[r exists "key:$j"]} assert {[r exists "key:$j"]}
@ -284,7 +288,8 @@ start_server {tags {"maxmemory"} overrides {server-threads 1}} {
# 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
# invalidation messages have a chance to trigger further eviction. # invalidation messages have a chance to trigger further eviction.
set used [s used_memory] set overhead [s mem_not_counted_for_evict]
set used [expr [s used_memory] - $overhead]
set limit [expr {$used - 40000}] set limit [expr {$used - 40000}]
r config set maxmemory $limit r config set maxmemory $limit