caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow scripts to timeout even if from the master instance.

Browse Source 
However the master scripts will be impossible to kill.

Related to #5297.
This commit is contained in:
antirez 2018-08-30 11:46:42 +02:00
parent f5b29c6444
commit 83af8ef1fd
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/scripting.c
View File

@ -1226,14 +1226,9 @@ void luaMaskCountHook(lua_State *lua, lua_Debug *ar) {
UNUSED(ar); UNUSED(ar);
UNUSED(lua); UNUSED(lua);
/* The conditions to timeout are: /* Set the timeout condition if not already set and the maximum
* 1. The caller is not our master. * execution time was reached. */
* 2. The timeout was reached. if (elapsed >= server.lua_time_limit && server.lua_timedout == 0) {
* 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
@ -1351,9 +1346,7 @@ void evalGenericCommand(client *c, int evalsha) {
server.lua_caller = c; server.lua_caller = c;
server.lua_time_start = mstime(); server.lua_time_start = mstime();
server.lua_kill = 0; server.lua_kill = 0;
if (server.lua_time_limit > 0 && server.masterhost == NULL && if (server.lua_time_limit > 0 && ldb.active == 0) {
ldb.active == 0)
{
lua_sethook(lua,luaMaskCountHook,LUA_MASKCOUNT,100000); lua_sethook(lua,luaMaskCountHook,LUA_MASKCOUNT,100000);
delhook = 1; delhook = 1;
} else if (ldb.active) { } else if (ldb.active) {
@ -1503,6 +1496,8 @@ NULL
} else if (c->argc == 2 && !strcasecmp(c->argv[1]->ptr,"kill")) { } else if (c->argc == 2 && !strcasecmp(c->argv[1]->ptr,"kill")) {
if (server.lua_caller == NULL) { if (server.lua_caller == NULL) {
addReplySds(c,sdsnew("-NOTBUSY No scripts in execution right now.\r\n")); addReplySds(c,sdsnew("-NOTBUSY No scripts in execution right now.\r\n"));
} else if (server.lua_caller->flags & CLIENT_MASTER) {
addReplySds(c,sdsnew("-UNKILLABLE The busy script was sent by a master instance in the context of replication and cannot be killed.\r\n"));
} else if (server.lua_write_dirty) { } else if (server.lua_write_dirty) {
addReplySds(c,sdsnew("-UNKILLABLE Sorry the script already executed write commands against the dataset. You can either wait the script termination or kill the server in a hard way using the SHUTDOWN NOSAVE command.\r\n")); addReplySds(c,sdsnew("-UNKILLABLE Sorry the script already executed write commands against the dataset. You can either wait the script termination or kill the server in a hard way using the SHUTDOWN NOSAVE command.\r\n"));
} else { } else {