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

Fix merge issue with wrong return type

Browse Source 
Former-commit-id: 1640a2fefb8f09c7b6b335838f14a7fd3a51ae88
This commit is contained in:
John Sully 2021-06-02 02:10:00 +00:00
parent d243d4e5df
commit e4cf5f442a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/evict.cpp
View File

@ -777,11 +777,11 @@ 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
return EVICT_OK; // Allow us to temporarily go over without OOMing
}
}
if (!cserver.delete_on_evict && result != C_OK)
if (!cserver.delete_on_evict && result == EVICT_FAIL)
{
for (int idb = 0; idb < cserver.dbnum; ++idb)
{
@ -791,7 +791,7 @@ cant_free:
serverLog(LL_WARNING, "Failed to evict keys, falling back to flushing entire cache. Consider increasing maxmemory-samples.");
db->removeAllCachedValues();
if (((mem_reported - zmalloc_used_memory()) + mem_freed) >= mem_tofree)
result = C_OK;
result = EVICT_OK;
}
}
}