fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-04 08:41:04 +00:00
Code Issues Projects Releases Wiki Activity

Allow scripts to timeout on slaves as well.

Browse Source 
See reasoning in .
This commit is contained in:
antirez 2018-08-29 18:14:46 +02:00
parent d05f5c8f64
commit f5b29c6444
2 changed files with 10 additions and 3 deletions

12
src/scripting.c

@ -1222,12 +1222,18 @@ sds luaCreateFunction(client *c, lua_State *lua, robj *body) {
/* This is the Lua script "count" hook that we use to detect scripts timeout. */ /* This is the Lua script "count" hook that we use to detect scripts timeout. */
void luaMaskCountHook(lua_State *lua, lua_Debug *ar) { void luaMaskCountHook(lua_State *lua, lua_Debug *ar) {
long long elapsed; long long elapsed = mstime() - server.lua_time_start;
UNUSED(ar); UNUSED(ar);
UNUSED(lua); UNUSED(lua);
elapsed = mstime() - server.lua_time_start; /* The conditions to timeout are:
if (elapsed >= server.lua_time_limit && server.lua_timedout == 0) { * 1. The caller is not our master.
* 2. The timeout was reached.
* 3. We are not already timed out. */
if (!(server.lua_caller->flags & CLIENT_MASTER) &&
elapsed >= server.lua_time_limit &&
server.lua_timedout == 0)
{
serverLog(LL_WARNING,"Lua slow script detected: still in execution after %lld milliseconds. You can try killing the script using the SCRIPT KILL command.",elapsed); serverLog(LL_WARNING,"Lua slow script detected: still in execution after %lld milliseconds. You can try killing the script using the SCRIPT KILL command.",elapsed);
server.lua_timedout = 1; server.lua_timedout = 1;
/* Once the script timeouts we reenter the event loop to permit others /* Once the script timeouts we reenter the event loop to permit others

1
src/server.c

@ -2683,6 +2683,7 @@ int processCommand(client *c) {
/* Lua script too slow? Only allow a limited number of commands. */ /* Lua script too slow? Only allow a limited number of commands. */
if (server.lua_timedout && if (server.lua_timedout &&
!(c->flags & CLIENT_MASTER) &&
c->cmd->proc != authCommand && c->cmd->proc != authCommand &&
c->cmd->proc != replconfCommand && c->cmd->proc != replconfCommand &&
!(c->cmd->proc == shutdownCommand && !(c->cmd->proc == shutdownCommand &&