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

Fixed critical memory leak from EVAL.

Browse Source 
Multiple missing calls to lua_pop prevented the error handler function
pushed on the stack for lua_pcall() to be popped before returning,
causing a memory leak in almost all the code paths of EVAL (both
successful calls and calls returning errors).

This caused two issues: Lua leaking memory (and this was very visible
from INFO memory output, as the 'used_memory_lua' field reported an
always increasing amount of memory used), and as a result slower and
slower GC cycles resulting in all the CPU being used.

Thanks to Tanguy Le Barzic for noticing something was wrong with his 2.8
slave, and for creating a testing EC2 environment where I was able to
investigate the issue.
This commit is contained in:
antirez 2013-08-29 11:49:23 +02:00
parent 9bb91d198c
commit 41d3147344
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/scripting.c
View File

@ -876,7 +876,12 @@ void evalGenericCommand(redisClient *c, int evalsha) {
addReply(c, shared.noscripterr); addReply(c, shared.noscripterr);
return; return;
} }
if (luaCreateFunction(c,lua,funcname,c->argv[1]) == REDIS_ERR) return; if (luaCreateFunction(c,lua,funcname,c->argv[1]) == REDIS_ERR) {
lua_pop(lua,1); /* remove the error handler from the stack. */
/* The error is sent to the client by luaCreateFunction()
* itself when it returns REDIS_ERR. */
return;
}
/* Now the following is guaranteed to return non nil */ /* Now the following is guaranteed to return non nil */
lua_getglobal(lua, funcname); lua_getglobal(lua, funcname);
redisAssert(!lua_isnil(lua,-1)); redisAssert(!lua_isnil(lua,-1));
@ -905,7 +910,6 @@ void evalGenericCommand(redisClient *c, int evalsha) {
/* At this point whether this script was never seen before or if it was /* At this point whether this script was never seen before or if it was
* already defined, we can call it. We have zero arguments and expect * already defined, we can call it. We have zero arguments and expect
* a single return value. */ * a single return value. */
err = lua_pcall(lua,0,1,-2); err = lua_pcall(lua,0,1,-2);
/* Perform some cleanup that we need to do both on error and success. */ /* Perform some cleanup that we need to do both on error and success. */
@ -924,11 +928,12 @@ void evalGenericCommand(redisClient *c, int evalsha) {
if (err) { if (err) {
addReplyErrorFormat(c,"Error running script (call to %s): %s\n", addReplyErrorFormat(c,"Error running script (call to %s): %s\n",
funcname, lua_tostring(lua,-1)); funcname, lua_tostring(lua,-1));
lua_pop(lua,1); /* Consume the Lua reply. */ lua_pop(lua,2); /* Consume the Lua reply and remove error handler. */
} else { } else {
/* On success convert the Lua return value into Redis protocol, and /* On success convert the Lua return value into Redis protocol, and
* send it to * the client. */ * send it to * the client. */
luaReplyToRedisReply(c,lua); luaReplyToRedisReply(c,lua); /* Convert and consume the reply. */
lua_pop(lua,1); /* Remove the error handler. */
} }
/* EVALSHA should be propagated to Slave and AOF file as full EVAL, unless /* EVALSHA should be propagated to Slave and AOF file as full EVAL, unless