mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix flaky test case for absolute TTL replication (#9069) 

The root cause is that one test (`5 keys in, 5 keys out`) is leaking a volatile key
that can expire while another later test(`All TTL in commands are propagated
as absolute timestamp in replication stream`) is running.
Such leaked expiration injects an unexpected `DEL` command into the
replication command during the later test, causing it to fail.

The fixes are two fold:
1. Plug the leak in the first test.
2. Add FLUSHALL to the later test, to avoid future interference from other tests.
This commit is contained in:
ny0312 2021-06-12 22:42:20 -07:00 committed by GitHub
parent 63da66bb63
commit fb140a1bff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/expire.c
View File

@ -570,7 +570,7 @@ void pexpireatCommand(client *c) {
expireGenericCommand(c,0,UNIT_MILLISECONDS); expireGenericCommand(c,0,UNIT_MILLISECONDS);
} }
/* Implements TTL, PTTL and EXPIRETIME */ /* Implements TTL, PTTL, EXPIRETIME and PEXPIRETIME */
void ttlGenericCommand(client *c, int output_ms, int output_abs) { void ttlGenericCommand(client *c, int output_ms, int output_abs) {
long long expire, ttl = -1; long long expire, ttl = -1;

6
tests/unit/expire.tcl
View File

@ -221,8 +221,9 @@ start_server {tags {"expire"}} {
r set e c r set e c
r set s c r set s c
r set foo b r set foo b
lsort [r keys *] assert_equal [lsort [r keys *]] {a e foo s t}
} {a e foo s t} r del a ; # Do not leak volatile keys to other tests
}
test {EXPIRE with empty string as TTL should report an error} { test {EXPIRE with empty string as TTL should report an error} {
r set foo bar r set foo bar
@ -433,6 +434,7 @@ start_server {tags {"expire"}} {
# stream, which is as absolute timestamps. # stream, which is as absolute timestamps.
# See: https://github.com/redis/redis/issues/8433 # See: https://github.com/redis/redis/issues/8433
r flushall ; # Clean up keyspace to avoid interference by keys from other tests
set repl [attach_to_replication_stream] set repl [attach_to_replication_stream]
# SET commands # SET commands
r set foo1 bar ex 200 r set foo1 bar ex 200