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

Fix bug where we don't correctly process maxmemory during bgsave

Browse Source 
Former-commit-id: a0f2694d15784628df5d5ecb72b42c2979100f93
This commit is contained in:
John Sully 2020-05-08 00:14:55 -04:00
parent a3b80c293b
commit da4cac6770
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/evict.cpp
View File

@ -433,7 +433,7 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev
if (fPreSnapshot) if (fPreSnapshot)
maxmemory = static_cast<size_t>(maxmemory * 0.9); // derate memory by 10% since we won't be able to free during snapshot maxmemory = static_cast<size_t>(maxmemory * 0.9); // derate memory by 10% since we won't be able to free during snapshot
if (g_pserver->FRdbSaveInProgress()) if (g_pserver->FRdbSaveInProgress())
maxmemory *= static_cast<size_t>(maxmemory*1.9); maxmemory = static_cast<size_t>(maxmemory*1.5);
/* We may return ASAP if there is no need to compute the level. */ /* We may return ASAP if there is no need to compute the level. */
int return_ok_asap = !maxmemory || mem_reported <= maxmemory; int return_ok_asap = !maxmemory || mem_reported <= maxmemory;