gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #6074 from trevor211/fixActiveExpire

Browse Source 
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 2395eeb6e0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server.c
View File

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