Merge pull request #6074 from trevor211/fixActiveExpire

Do not active expire keys in the background when the switch is off.
This commit is contained in:
Salvatore Sanfilippo 2019-05-10 12:39:35 +02:00 committed by GitHub
commit 34f6d94701
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1674,11 +1674,13 @@ void clientsCron(void) {
void databasesCron(void) {
/* Expire keys by random sampling. Not required for slaves
* as master will synthesize DELs for us. */
if (server.active_expire_enabled && server.masterhost == NULL) {
if (server.active_expire_enabled) {
if (server.masterhost == NULL) {
activeExpireCycle(ACTIVE_EXPIRE_CYCLE_SLOW);
} else if (server.masterhost != NULL) {
} else {
expireSlaveKeys();
}
}
/* Defrag keys gradually. */
if (server.active_defrag_enabled)