Merge pull request #4028 from zintrepid/prevent_expirations_while_paused

Prevent expirations and evictions while paused
This commit is contained in:
Salvatore Sanfilippo
2017-06-23 11:39:02 +02:00
committed by GitHub
2 changed files with 10 additions and 0 deletions

View File

@ -105,6 +105,10 @@ void activeExpireCycle(int type) {
int dbs_per_call = CRON_DBS_PER_CALL;
long long start = ustime(), timelimit;
/* We cannot expire keys while clients are paused as the dataset is
* supposed to be static. */
if (clientsArePaused()) return;
if (type == ACTIVE_EXPIRE_CYCLE_FAST) {
/* Don't start a fast cycle if the previous cycle did not exited
* for time limt. Also don't repeat a fast cycle for the same period