fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-03 08:11:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5689 from soloestoy/donot-evict-when-AOF-loading

Browse Source 
evict: don't care about mem if loading
This commit is contained in:
Salvatore Sanfilippo 2018-12-12 11:29:10 +01:00 committed by GitHub
commit 7ae184bfea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/evict.c
View File

@ -444,9 +444,15 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev
* Otehrwise if we are over the memory limit, but not enough memory * Otehrwise if we are over the memory limit, but not enough memory
* was freed to return back under the limit, the function returns C_ERR. */ * was freed to return back under the limit, the function returns C_ERR. */
int freeMemoryIfNeeded(void) { int freeMemoryIfNeeded(void) {
/* By default slaves should ignore maxmemory and just be masters excat /* By default replicas should ignore maxmemory
* copies. */ * and just be masters exact copies.
if (server.masterhost && server.repl_slave_ignore_maxmemory) return C_OK; *
* And don't care about mem if loading. */
if (server.loading ||
(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;