mirror of
https://github.com/fluencelabs/redis
synced 2025-03-17 16:10:50 +00:00
After slave Lua script leaves busy state, re-process the master buffer.
Technically speaking we don't really need to put the master client in the clients that need to be processed, since in practice the PING commands from the master will take care, however it is conceptually more sane to do so.
This commit is contained in:
parent
9ab91b8c6c
commit
7fa493912e
@ -827,8 +827,7 @@ void freeClient(client *c) {
|
||||
serverLog(LL_WARNING,"Connection with master lost.");
|
||||
if (!(c->flags & (CLIENT_CLOSE_AFTER_REPLY|
|
||||
CLIENT_CLOSE_ASAP|
|
||||
CLIENT_BLOCKED|
|
||||
CLIENT_UNBLOCKED)))
|
||||
CLIENT_BLOCKED)))
|
||||
{
|
||||
replicationCacheMaster(c);
|
||||
return;
|
||||
|
@ -1367,6 +1367,10 @@ void evalGenericCommand(client *c, int evalsha) {
|
||||
* script timeout was detected. */
|
||||
aeCreateFileEvent(server.el,c->fd,AE_READABLE,
|
||||
readQueryFromClient,c);
|
||||
if (server.masterhost && server.master) {
|
||||
server.master->flags |= CLIENT_UNBLOCKED;
|
||||
listAddNodeTail(server.unblocked_clients,server.master);
|
||||
}
|
||||
}
|
||||
server.lua_caller = NULL;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user