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

Update cached time during slow scripts & transactions

Browse Source 
Commands may use cached time when the precision is not vital. It is
a good idea to refresh it from time to time during the execution of long
running scripts or transactions composed of quite a lot of commands.
This commit is contained in:
antirez 2015-05-04 11:59:09 +02:00
parent e64d089089
commit 27db456332
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/multi.c
View File

@ -162,6 +162,10 @@ void execCommand(redisClient *c) {
c->mstate.commands[j].argc = c->argc; c->mstate.commands[j].argc = c->argc;
c->mstate.commands[j].argv = c->argv; c->mstate.commands[j].argv = c->argv;
c->mstate.commands[j].cmd = c->cmd; c->mstate.commands[j].cmd = c->cmd;
/* From time to time, update the cached time so that if the transaction
* is huge, we'll have a chance to have more updated time info. */
if (j && j % 10000) updateCachedTime();
} }
c->argv = orig_argv; c->argv = orig_argv;
c->argc = orig_argc; c->argc = orig_argc;

3
src/scripting.c
View File

@ -546,7 +546,8 @@ void luaMaskCountHook(lua_State *lua, lua_Debug *ar) {
REDIS_NOTUSED(ar); REDIS_NOTUSED(ar);
REDIS_NOTUSED(lua); REDIS_NOTUSED(lua);
elapsed = mstime() - server.lua_time_start; updateCachedTime();
elapsed = server.mstime - server.lua_time_start;
if (elapsed >= server.lua_time_limit && server.lua_timedout == 0) { if (elapsed >= server.lua_time_limit && server.lua_timedout == 0) {
redisLog(REDIS_WARNING,"Lua slow script detected: still in execution after %lld milliseconds. You can try killing the script using the SCRIPT KILL command.",elapsed); redisLog(REDIS_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;