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

Merge pull request #4838 from soloestoy/lazyfree-eviction

Browse Source 
lazyfree & eviction: record latency generated by lazyfree eviction
This commit is contained in:
Salvatore Sanfilippo 2020-04-30 10:43:12 +02:00 committed by GitHub
commit 15b040907c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/evict.c
View File

@ -450,9 +450,10 @@ int freeMemoryIfNeeded(void) {
if (server.masterhost && server.repl_slave_ignore_maxmemory) return C_OK; if (server.masterhost && server.repl_slave_ignore_maxmemory) return C_OK;
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, lazyfree_latency;
long long delta; long long delta;
int slaves = listLength(server.slaves); int slaves = listLength(server.slaves);
int result = C_ERR;
/* 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
@ -463,10 +464,10 @@ int freeMemoryIfNeeded(void) {
mem_freed = 0; mem_freed = 0;
latencyStartMonitor(latency);
if (server.maxmemory_policy == MAXMEMORY_NO_EVICTION) if (server.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. */
latencyStartMonitor(latency);
while (mem_freed < mem_tofree) { while (mem_freed < mem_tofree) {
int j, k, i; int j, k, i;
static unsigned int next_db = 0; static unsigned int next_db = 0;
@ -572,7 +573,6 @@ int freeMemoryIfNeeded(void) {
signalModifiedKey(NULL,db,keyobj); signalModifiedKey(NULL,db,keyobj);
latencyEndMonitor(eviction_latency); latencyEndMonitor(eviction_latency);
latencyAddSampleIfNeeded("eviction-del",eviction_latency); latencyAddSampleIfNeeded("eviction-del",eviction_latency);
latencyRemoveNestedEvent(latency,eviction_latency);
delta -= (long long) zmalloc_used_memory(); delta -= (long long) zmalloc_used_memory();
mem_freed += delta; mem_freed += delta;
server.stat_evictedkeys++; server.stat_evictedkeys++;
@ -601,25 +601,30 @@ int freeMemoryIfNeeded(void) {
} }
} }
} else { } else {
latencyEndMonitor(latency);
latencyAddSampleIfNeeded("eviction-cycle",latency);
goto cant_free; /* nothing to free... */ goto cant_free; /* nothing to free... */
} }
} }
latencyEndMonitor(latency); result = C_OK;
latencyAddSampleIfNeeded("eviction-cycle",latency);
return C_OK;
cant_free: cant_free:
/* We are here if we are not able to reclaim memory. There is only one /* We are here if we are not able to reclaim memory. There is only one
* last thing we can try: check if the lazyfree thread has jobs in queue * last thing we can try: check if the lazyfree thread has jobs in queue
* and wait... */ * and wait... */
while(bioPendingJobsOfType(BIO_LAZY_FREE)) { if (result != C_OK) {
if (((mem_reported - zmalloc_used_memory()) + mem_freed) >= mem_tofree) latencyStartMonitor(lazyfree_latency);
break; while(bioPendingJobsOfType(BIO_LAZY_FREE)) {
usleep(1000); if (getMaxmemoryState(NULL,NULL,NULL,NULL) == C_OK) {
result = C_OK;
break;
}
usleep(1000);
}
latencyEndMonitor(lazyfree_latency);
latencyAddSampleIfNeeded("eviction-lazyfree",lazyfree_latency);
} }
return C_ERR; latencyEndMonitor(latency);
latencyAddSampleIfNeeded("eviction-cycle",latency);
return result;
} }
/* This is a wrapper for freeMemoryIfNeeded() that only really calls the /* This is a wrapper for freeMemoryIfNeeded() that only really calls the