From 2290c4bee1904d4418fd1fa9192a3fbc13bf38b0 Mon Sep 17 00:00:00 2001 From: "zhaozhao.zz" Date: Mon, 3 Sep 2018 14:36:48 +0800 Subject: [PATCH] if master is already unblocked, do not unblock it twice --- src/scripting.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripting.c b/src/scripting.c index 4b36a085..6c311dbe 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); }