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
0fefed25
Commit
0fefed25
authored
Nov 19, 2019
by
antirez
Browse files
Fix patch provided in #6554.
parent
e9fbc960
Changes
1
Show whitespace changes
Inline
Side-by-side
src/blocked.c
View file @
0fefed25
...
@@ -262,6 +262,13 @@ void handleClientsBlockedOnKeys(void) {
...
@@ -262,6 +262,13 @@ void handleClientsBlockedOnKeys(void) {
* we can safely call signalKeyAsReady() against this key. */
* we can safely call signalKeyAsReady() against this key. */
dictDelete
(
rl
->
db
->
ready_keys
,
rl
->
key
);
dictDelete
(
rl
->
db
->
ready_keys
,
rl
->
key
);
/* Even if we are not inside call(), increment the call depth
* in order to make sure that keys are expired against a fixed
* reference time, and not against the wallclock time. This
* way we can lookup an object multiple times (BRPOPLPUSH does
* that) without the risk of it being freed in the second
* lookup, invalidating the first one.
* See https://github.com/antirez/redis/pull/6554. */
server
.
call_depth
++
;
server
.
call_depth
++
;
updateCachedTime
(
0
);
updateCachedTime
(
0
);
...
@@ -461,7 +468,7 @@ void handleClientsBlockedOnKeys(void) {
...
@@ -461,7 +468,7 @@ void handleClientsBlockedOnKeys(void) {
}
}
}
}
server
.
call_depth
++
;
server
.
call_depth
--
;
/* Free this item. */
/* Free this item. */
decrRefCount
(
rl
->
key
);
decrRefCount
(
rl
->
key
);
...
...
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