diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2020-04-06 11:59:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 11:59:01 +0200 |
| commit | af5c11874c4e534db0ca1c44c2ca20fec1ab2700 (patch) | |
| tree | dcdc692418ef2ee3355b4f90ce2d6e539a2ab2ba /src/scripting.c | |
| parent | 4bc4d2c7676430b752cb1f7114bfdc76a49b260d (diff) | |
| parent | 38f6207f884f514e928513acb6560fdb375daa2e (diff) | |
| download | redis-af5c11874c4e534db0ca1c44c2ca20fec1ab2700.tar.gz | |
Merge pull request #6797 from patpatbear/issue_#6565_memory_borderline
Check OOM at script start to get stable lua OOM state.
Diffstat (limited to 'src/scripting.c')
| -rw-r--r-- | src/scripting.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/scripting.c b/src/scripting.c index 7f64e06db..32a511e13 100644 --- a/src/scripting.c +++ b/src/scripting.c @@ -657,12 +657,11 @@ int luaRedisGenericCommand(lua_State *lua, int raise_error) { !server.loading && /* Don't care about mem if loading. */ !server.masterhost && /* Slave must execute the script. */ server.lua_write_dirty == 0 && /* Script had no side effects so far. */ + server.lua_oom && /* Detected OOM when script start. */ (cmd->flags & CMD_DENYOOM)) { - if (getMaxmemoryState(NULL,NULL,NULL,NULL) != C_OK) { - luaPushError(lua, shared.oomerr->ptr); - goto cleanup; - } + luaPushError(lua, shared.oomerr->ptr); + goto cleanup; } if (cmd->flags & CMD_RANDOM) server.lua_random_dirty = 1; |