summaryrefslogtreecommitdiff
path: root/src/expire.c
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2019-11-18 11:43:42 +0100
committerantirez <antirez@gmail.com>2019-11-18 11:43:42 +0100
commit2ab51a644d3d390df50dc1bc59958a15affeb341 (patch)
tree36b9f0d581e8899e8ec99b37cab460580efbe1b4 /src/expire.c
parent1ccc270a2cb3f489e85560f1c953b105997c8b1a (diff)
downloadredis-2ab51a644d3d390df50dc1bc59958a15affeb341.tar.gz
Expire cycle: fix parameters computation.
Diffstat (limited to 'src/expire.c')
-rw-r--r--src/expire.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/expire.c b/src/expire.c
index dd8a42726..ea7e2b456 100644
--- a/src/expire.c
+++ b/src/expire.c
@@ -125,16 +125,15 @@ void activeExpireCycle(int type) {
* effort. The default effort is 1, and the maximum configurable effort
* is 10. */
unsigned long
- effort = server.active_expire_effort,
+ effort = server.active_expire_effort-1, /* Rescale from 0 to 9. */
config_keys_per_loop = ACTIVE_EXPIRE_CYCLE_KEYS_PER_LOOP +
ACTIVE_EXPIRE_CYCLE_KEYS_PER_LOOP/4*effort,
- config_cycle_fast_duration = ACTIVE_EXPIRE_CYCLE_FAST_DURATION *
+ config_cycle_fast_duration = ACTIVE_EXPIRE_CYCLE_FAST_DURATION +
ACTIVE_EXPIRE_CYCLE_FAST_DURATION/4*effort,
config_cycle_slow_time_perc = ACTIVE_EXPIRE_CYCLE_SLOW_TIME_PERC +
2*effort,
config_cycle_acceptable_stale = ACTIVE_EXPIRE_CYCLE_ACCEPTABLE_STALE-
effort;
- if (config_cycle_acceptable_stale < 1) config_cycle_acceptable_stale = 1;
/* This function has some global state in order to continue the work
* incrementally across calls. */