fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-17 11:11:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6401 from valentinogeron/fix-discard-during-oom

Browse Source 
DISCARD should not fail during OOM
This commit is contained in:
Salvatore Sanfilippo
2019-09-25 18:07:25 +02:00
committed by GitHub
parent f6cf08e582 7a73b7f168
commit f3aaf2b4d8
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server.c
View File

@ -3412,7 +3412,7 @@ int processCommand(client *c) {
* is in MULTI/EXEC context? Error. */
if (out_of_memory &&
(c->cmd->flags & CMD_DENYOOM ||
(c->flags & CLIENT_MULTI && c->cmd->proc != execCommand))) {
(c->flags & CLIENT_MULTI && c->cmd->proc != execCommand && c->cmd->proc != discardCommand))) {
flagTransaction(c);
addReply(c, shared.oomerr);
return C_OK;