mirror of
https://github.com/fluencelabs/redis
synced 2025-03-18 16:40:50 +00:00
evict: don't care about mem if loading
When loading data, we call processEventsWhileBlocked to process events and execute commands. But if we are loading AOF it's dangerous, because processCommand would call freeMemoryIfNeeded to evict, and that will break data consistency, see issue #5686.
This commit is contained in:
parent
0110e46f6e
commit
b9cd89d108
12
src/evict.c
12
src/evict.c
@ -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
|
||||
* was freed to return back under the limit, the function returns C_ERR. */
|
||||
int freeMemoryIfNeeded(void) {
|
||||
/* By default slaves should ignore maxmemory and just be masters excat
|
||||
* copies. */
|
||||
if (server.masterhost && server.repl_slave_ignore_maxmemory) return C_OK;
|
||||
/* By default replicas should ignore maxmemory
|
||||
* and just be masters exact copies.
|
||||
*
|
||||
* 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;
|
||||
mstime_t latency, eviction_latency;
|
||||
|
Loading…
x
Reference in New Issue
Block a user