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

Try harder to free memory

Browse Source 
Former-commit-id: 48f7c34c91c51ef06d9a1f4e8bc5f1f5cd88cfaa
This commit is contained in:
John Sully 2019-12-14 19:46:39 -05:00
parent fce67c145f
commit 31d42faf27
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/evict.cpp
View File

@ -481,7 +481,6 @@ int freeMemoryIfNeeded(void) {
size_t mem_reported, mem_tofree, mem_freed; size_t mem_reported, mem_tofree, mem_freed;
mstime_t latency, eviction_latency; mstime_t latency, eviction_latency;
long long delta; long long delta;
int numtries = 0;
int slaves = listLength(g_pserver->slaves); int slaves = listLength(g_pserver->slaves);
/* 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
@ -493,6 +492,14 @@ int freeMemoryIfNeeded(void) {
mem_freed = 0; mem_freed = 0;
size_t maxKeys = 0;
size_t totalKeysFreed = 0;
for (int i = 0; i < cserver.dbnum; ++i)
maxKeys += g_pserver->db[i]->size();
// A random search is n log n, so if we run longer than this we know we're not going to terminate
maxKeys = static_cast<size_t>(maxKeys * (log2(maxKeys)));
if (g_pserver->maxmemory_policy == MAXMEMORY_NO_EVICTION) if (g_pserver->maxmemory_policy == MAXMEMORY_NO_EVICTION)
goto cant_free; /* We need to free memory, but policy forbids. */ goto cant_free; /* We need to free memory, but policy forbids. */
@ -573,19 +580,12 @@ int freeMemoryIfNeeded(void) {
if (g_pserver->maxmemory_policy == MAXMEMORY_ALLKEYS_RANDOM) if (g_pserver->maxmemory_policy == MAXMEMORY_ALLKEYS_RANDOM)
{ {
if (db->size() != 0) { if (db->size() != 0) {
for (int i = 0; i < 16; ++i)
{
auto itr = db->random_threadsafe(); auto itr = db->random_threadsafe();
if (itr.val() != nullptr)
{
bestkey = itr.key(); bestkey = itr.key();
bestdbid = j; bestdbid = j;
break; break;
} }
} }
break;
}
}
else else
{ {
if (db->expireSize()) if (db->expireSize())
@ -606,8 +606,7 @@ int freeMemoryIfNeeded(void) {
{ {
// 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();
if (!db->removeCachedValue(bestkey)) db->removeCachedValue(bestkey);
keys_freed--; // didn't actuall free this one (we inc below)
delta -= (long long) zmalloc_used_memory(); delta -= (long long) zmalloc_used_memory();
mem_freed += delta; mem_freed += delta;
} }
@ -640,8 +639,8 @@ int freeMemoryIfNeeded(void) {
decrRefCount(keyobj); decrRefCount(keyobj);
} }
if (delta != 0) // delta can be zero if a snapshot has a ref
keys_freed++; keys_freed++;
totalKeysFreed++;
/* When the memory to free starts to be big enough, we may /* When the memory to free starts to be big enough, we may
* start spending so much time here that is impossible to * start spending so much time here that is impossible to
@ -663,16 +662,18 @@ int freeMemoryIfNeeded(void) {
} }
} }
} }
++numtries;
// When using FLASH we're not actually evicting and we leave around the key
// its possible we tried to evict the whole database and failed to free enough memory
// quit if this happens
if (totalKeysFreed >= maxKeys)
{
latencyEndMonitor(latency);
latencyAddSampleIfNeeded("eviction-cycle",latency);
goto cant_free;
}
if (keys_freed <= 0) { if (keys_freed <= 0) {
if (g_pserver->m_pstorageFactory != nullptr)
{
// If we have external storage failure to evict doesn't mean there are no
// keys to free
if (bestkey != nullptr && numtries < 16)
continue;
}
latencyEndMonitor(latency); latencyEndMonitor(latency);
latencyAddSampleIfNeeded("eviction-cycle",latency); latencyAddSampleIfNeeded("eviction-cycle",latency);
goto cant_free; /* nothing to free... */ goto cant_free; /* nothing to free... */