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

Eliminate eviction loops. And don't OOM so often with storage providers set

Browse Source 
Former-commit-id: 6e61cd33b4366f008b07aae88f49fd0ac9cbcaec
This commit is contained in:
John Sully 2020-07-11 04:23:35 +00:00
parent cce6183f07
commit a5f61b903b
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/evict.cpp
View File

@ -496,6 +496,7 @@ int freeMemoryIfNeeded(bool fPreSnapshot) {
int slaves = listLength(g_pserver->slaves); int slaves = listLength(g_pserver->slaves);
const bool fEvictToStorage = !cserver.delete_on_evict && g_pserver->db[0]->FStorageProvider(); const bool fEvictToStorage = !cserver.delete_on_evict && g_pserver->db[0]->FStorageProvider();
int result = C_ERR; int result = C_ERR;
int ckeysFailed = 0;
/* When clients are paused the dataset should be static not just from the /* When clients are paused the dataset should be static not just from the
* POV of clients not being able to write, but also from the POV of * POV of clients not being able to write, but also from the POV of
@ -618,8 +619,16 @@ int freeMemoryIfNeeded(bool fPreSnapshot) {
{ {
// This key is in the storage so we only need to free the object // This key is in the storage so we only need to free the object
delta = (long long) zmalloc_used_memory(); delta = (long long) zmalloc_used_memory();
db->removeCachedValue(bestkey); if (db->removeCachedValue(bestkey)) {
delta -= (long long) zmalloc_used_memory(); delta -= (long long) zmalloc_used_memory();
ckeysFailed = 0;
}
else {
delta = 0;
ckeysFailed++;
if (ckeysFailed > 1024)
goto cant_free;
}
mem_freed += delta; mem_freed += delta;
} }
else else
@ -678,6 +687,13 @@ int freeMemoryIfNeeded(bool fPreSnapshot) {
result = C_OK; result = C_OK;
cant_free: cant_free:
if (g_pserver->m_pstorageFactory)
{
if (mem_reported < g_pserver->maxmemory*1.2) {
return C_OK; // Allow us to temporarily go over without OOMing
}
}
if (!cserver.delete_on_evict && result != C_OK) if (!cserver.delete_on_evict && result != C_OK)
{ {
for (int idb = 0; idb < cserver.dbnum; ++idb) for (int idb = 0; idb < cserver.dbnum; ++idb)