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

Fix leak in new errorstats commit, and a flaky test (#8278)

Browse Source
This commit is contained in:
Oran Agra 2021-01-02 08:37:19 +02:00 committed by GitHub
parent 152b5d46c4
commit 71fbe6e800
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server.c
View File

@ -3301,7 +3301,7 @@ void resetCommandTableStats(void) {
} }
void resetErrorTableStats(void) { void resetErrorTableStats(void) {
raxFree(server.errors); raxFreeWithCallback(server.errors, zfree);
server.errors = raxNew(); server.errors = raxNew();
} }

23
tests/cluster/tests/18-info.tcl
View File

@ -26,11 +26,20 @@ test "errorstats: rejected call due to MOVED Redirection" {
$primary2 config resetstat $primary2 config resetstat
assert_match {} [errorstat $primary1 MOVED] assert_match {} [errorstat $primary1 MOVED]
assert_match {} [errorstat $primary2 MOVED] assert_match {} [errorstat $primary2 MOVED]
# we know that the primary 2 will have a MOVED reply # we know that one will have a MOVED reply and one will succeed
catch {$primary1 set key{0x0000} b} replyP1 catch {$primary1 set key b} replyP1
catch {$primary2 set key{0x0000} b} replyP2 catch {$primary2 set key b} replyP2
assert_match {OK} $replyP1 # sort servers so we know which one failed
assert_match {} [errorstat $primary1 MOVED] if {$replyP1 eq {OK}} {
assert_match {*count=1*} [errorstat $primary2 MOVED] assert_match {MOVED*} $replyP2
assert_match {*calls=0,*,rejected_calls=1,failed_calls=0} [cmdstat $primary2 set] set pok $primary1
set perr $primary2
} else {
assert_match {MOVED*} $replyP1
set pok $primary2
set perr $primary1
}
assert_match {} [errorstat $pok MOVED]
assert_match {*count=1*} [errorstat $perr MOVED]
assert_match {*calls=0,*,rejected_calls=1,failed_calls=0} [cmdstat $perr set]
} }