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

Tests: fix new defrag test to be skipped when not supported (#8185)

Browse Source 
Additionally the older defrag tests are using an obsolete way to check
if the defragger is suuported (the error no longer contains "DISABLED").
this doesn't usually makes a difference since these tests are completely
skipped if the allocator is not jemalloc, but that would fail if the
allocator is a jemalloc that doesn't support defrag.
This commit is contained in:
Oran Agra 2020-12-14 11:13:46 +02:00 committed by GitHub
parent 1e301ff83e
commit 7d9b09adaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit/memefficiency.tcl
View File

@ -63,7 +63,7 @@ start_server {tags {"defrag"} overrides {appendonly yes auto-aof-rewrite-percent
r config set maxmemory 110mb ;# prevent further eviction (not to fail the digest test) r config set maxmemory 110mb ;# prevent further eviction (not to fail the digest test)
set digest [r debug digest] set digest [r debug digest]
catch {r config set activedefrag yes} e catch {r config set activedefrag yes} e
if {![string match {DISABLED*} $e]} { if {[r config get activedefrag] eq "activedefrag yes"} {
# Wait for the active defrag to start working (decision once a # Wait for the active defrag to start working (decision once a
# second). # second).
wait_for_condition 50 100 { wait_for_condition 50 100 {
@ -236,7 +236,7 @@ start_server {tags {"defrag"} overrides {appendonly yes auto-aof-rewrite-percent
set digest [r debug digest] set digest [r debug digest]
catch {r config set activedefrag yes} e catch {r config set activedefrag yes} e
if {![string match {DISABLED*} $e]} { if {[r config get activedefrag] eq "activedefrag yes"} {
# wait for the active defrag to start working (decision once a second) # wait for the active defrag to start working (decision once a second)
wait_for_condition 50 100 { wait_for_condition 50 100 {
[s active_defrag_running] ne 0 [s active_defrag_running] ne 0
@ -332,7 +332,7 @@ start_server {tags {"defrag"} overrides {appendonly yes auto-aof-rewrite-percent
set digest [r debug digest] set digest [r debug digest]
catch {r config set activedefrag yes} e catch {r config set activedefrag yes} e
if {![string match {DISABLED*} $e]} { if {[r config get activedefrag] eq "activedefrag yes"} {
# wait for the active defrag to start working (decision once a second) # wait for the active defrag to start working (decision once a second)
wait_for_condition 50 100 { wait_for_condition 50 100 {
[s active_defrag_running] ne 0 [s active_defrag_running] ne 0
@ -452,7 +452,7 @@ start_server {tags {"defrag"} overrides {appendonly yes auto-aof-rewrite-percent
set digest [r debug digest] set digest [r debug digest]
catch {r config set activedefrag yes} e catch {r config set activedefrag yes} e
if {![string match {DISABLED*} $e]} { if {[r config get activedefrag] eq "activedefrag yes"} {
# wait for the active defrag to start working (decision once a second) # wait for the active defrag to start working (decision once a second)
wait_for_condition 50 100 { wait_for_condition 50 100 {
[s active_defrag_running] ne 0 [s active_defrag_running] ne 0

59
tests/unit/moduleapi/defrag.tcl
View File

@ -3,41 +3,44 @@ set testmodule [file normalize tests/modules/defragtest.so]
start_server {tags {"modules"} overrides {{save ""}}} { start_server {tags {"modules"} overrides {{save ""}}} {
r module load $testmodule 10000 r module load $testmodule 10000
r config set hz 100 r config set hz 100
r config set active-defrag-ignore-bytes 1
r config set active-defrag-threshold-lower 0
r config set active-defrag-cycle-min 99
test {Module defrag: simple key defrag works} { # try to enable active defrag, it will fail if redis was compiled without it
r frag.create key1 1 1000 0 catch {r config set activedefrag yes} e
if {[r config get activedefrag] eq "activedefrag yes"} {
r config set active-defrag-ignore-bytes 1 test {Module defrag: simple key defrag works} {
r config set active-defrag-threshold-lower 0 r frag.create key1 1 1000 0
r config set active-defrag-cycle-min 99
r config set activedefrag yes
after 2000 after 2000
set info [r info defragtest_stats] set info [r info defragtest_stats]
assert {[getInfoProperty $info defragtest_datatype_attempts] > 0} assert {[getInfoProperty $info defragtest_datatype_attempts] > 0}
assert_equal 0 [getInfoProperty $info defragtest_datatype_resumes] assert_equal 0 [getInfoProperty $info defragtest_datatype_resumes]
} }
test {Module defrag: late defrag with cursor works} { test {Module defrag: late defrag with cursor works} {
r flushdb r flushdb
r frag.resetstats r frag.resetstats
# key can only be defragged in no less than 10 iterations # key can only be defragged in no less than 10 iterations
# due to maxstep # due to maxstep
r frag.create key2 10000 100 1000 r frag.create key2 10000 100 1000
after 2000 after 2000
set info [r info defragtest_stats] set info [r info defragtest_stats]
assert {[getInfoProperty $info defragtest_datatype_resumes] > 10} assert {[getInfoProperty $info defragtest_datatype_resumes] > 10}
assert_equal 0 [getInfoProperty $info defragtest_datatype_wrong_cursor] assert_equal 0 [getInfoProperty $info defragtest_datatype_wrong_cursor]
} }
test {Module defrag: global defrag works} { test {Module defrag: global defrag works} {
r flushdb r flushdb
r frag.resetstats r frag.resetstats
after 2000 after 2000
set info [r info defragtest_stats] set info [r info defragtest_stats]
assert {[getInfoProperty $info defragtest_global_attempts] > 0} assert {[getInfoProperty $info defragtest_global_attempts] > 0}
}
} }
} }