gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

After slave Lua script leaves busy state, re-process the master buffer.

Browse Source 
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:
antirez 2018-08-31 16:07:03 +02:00
parent e789b562f3
commit 99316560f1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/networking.c
View File

@ -827,8 +827,7 @@ void freeClient(client *c) {
serverLog(LL_WARNING,"Connection with master lost."); serverLog(LL_WARNING,"Connection with master lost.");
if (!(c->flags & (CLIENT_CLOSE_AFTER_REPLY| if (!(c->flags & (CLIENT_CLOSE_AFTER_REPLY|
CLIENT_CLOSE_ASAP| CLIENT_CLOSE_ASAP|
CLIENT_BLOCKED| CLIENT_BLOCKED)))
CLIENT_UNBLOCKED)))
{ {
replicationCacheMaster(c); replicationCacheMaster(c);
return; return;

4
src/scripting.c
View File

@ -1367,6 +1367,10 @@ 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) {
server.master->flags |= CLIENT_UNBLOCKED;
listAddNodeTail(server.unblocked_clients,server.master);
}
} }
server.lua_caller = NULL; server.lua_caller = NULL;