Fix OOM issues during full sync when fork bgsave is used (#209)
This commit is contained in:
parent
c0177198a8
commit
d552fd01e1
@ -427,7 +427,7 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev
|
|||||||
size_t maxmemory = g_pserver->maxmemory;
|
size_t maxmemory = g_pserver->maxmemory;
|
||||||
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() && !cserver.fForkBgSave)
|
||||||
maxmemory = static_cast<size_t>(maxmemory*1.2);
|
maxmemory = static_cast<size_t>(maxmemory*1.2);
|
||||||
|
|
||||||
/* If available system memory is below a certain threshold, force eviction */
|
/* If available system memory is below a certain threshold, force eviction */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user