Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
a3e53cf9
Commit
a3e53cf9
authored
Jun 01, 2017
by
Zachary Marquez
Browse files
Prevent expirations and evictions while paused
Proposed fix to
https://github.com/antirez/redis/issues/4027
parent
e91b81c6
Changes
2
Show whitespace changes
Inline
Side-by-side
src/evict.c
View file @
a3e53cf9
...
...
@@ -380,6 +380,12 @@ int freeMemoryIfNeeded(void) {
long
long
delta
;
int
slaves
=
listLength
(
server
.
slaves
);
/* We cannot free memory while clients are paused as this will require
* evictions which modify the dataset and will break the guarantee that
* data will be static while clients are paused. */
if
(
clientsArePaused
())
goto
cant_free
;
/* Check if we are over the memory usage limit. If we are not, no need
* to subtract the slaves output buffers. We can just return ASAP. */
mem_reported
=
zmalloc_used_memory
();
...
...
src/expire.c
View file @
a3e53cf9
...
...
@@ -105,6 +105,10 @@ void activeExpireCycle(int type) {
int
dbs_per_call
=
CRON_DBS_PER_CALL
;
long
long
start
=
ustime
(),
timelimit
;
/* We cannot expire keys while clients are paused as the dataset is
* supposed to be static. */
if
(
clientsArePaused
())
return
;
if
(
type
==
ACTIVE_EXPIRE_CYCLE_FAST
)
{
/* Don't start a fast cycle if the previous cycle did not exited
* for time limt. Also don't repeat a fast cycle for the same period
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment