summaryrefslogtreecommitdiff
path: root/src/scripting.c
diff options
context:
space:
mode:
authorzhaozhao.zz <zhaozhao.zz@alibaba-inc.com>2018-09-03 14:36:48 +0800
committerzhaozhao.zz <zhaozhao.zz@alibaba-inc.com>2018-09-03 14:36:48 +0800
commit2290c4bee1904d4418fd1fa9192a3fbc13bf38b0 (patch)
treea190be3ab0de371ddfbda73d54b929b2abba0c18 /src/scripting.c
parente3dfd8c811e12b6b1d3f7febf732b23fdaab497b (diff)
downloadredis-2290c4bee1904d4418fd1fa9192a3fbc13bf38b0.tar.gz
if master is already unblocked, do not unblock it twice
Diffstat (limited to 'src/scripting.c')
-rw-r--r--src/scripting.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scripting.c b/src/scripting.c
index 4b36a085b..6c311dbe0 100644
--- a/src/scripting.c
+++ b/src/scripting.c
@@ -1367,7 +1367,7 @@ void evalGenericCommand(client *c, int evalsha) {
* script timeout was detected. */
aeCreateFileEvent(server.el,c->fd,AE_READABLE,
readQueryFromClient,c);
- if (server.masterhost && server.master) {
+ if (server.masterhost && server.master && !(server.master->flags & CLIENT_UNBLOCKED)) {
server.master->flags |= CLIENT_UNBLOCKED;
listAddNodeTail(server.unblocked_clients,server.master);
}