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
839bb52c
Commit
839bb52c
authored
Sep 03, 2018
by
zhaozhao.zz
Committed by
antirez
Sep 04, 2018
Browse files
if master is already unblocked, do not unblock it twice
parent
2e1cd82d
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/scripting.c
View file @
839bb52c
...
@@ -1367,7 +1367,7 @@ void evalGenericCommand(client *c, int evalsha) {
...
@@ -1367,7 +1367,7 @@ void evalGenericCommand(client *c, int evalsha) {
* script timeout was detected. */
* script timeout was detected. */
aeCreateFileEvent
(
server
.
el
,
c
->
fd
,
AE_READABLE
,
aeCreateFileEvent
(
server
.
el
,
c
->
fd
,
AE_READABLE
,
readQueryFromClient
,
c
);
readQueryFromClient
,
c
);
if
(
server
.
masterhost
&&
server
.
master
)
{
if
(
server
.
masterhost
&&
server
.
master
&&
!
(
server
.
master
->
flags
&
CLIENT_UNBLOCKED
)
)
{
server
.
master
->
flags
|=
CLIENT_UNBLOCKED
;
server
.
master
->
flags
|=
CLIENT_UNBLOCKED
;
listAddNodeTail
(
server
.
unblocked_clients
,
server
.
master
);
listAddNodeTail
(
server
.
unblocked_clients
,
server
.
master
);
}
}
...
...
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