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

Fixed the reply about denied write commands under maxmemory reached condition: now the error will no longer lead to a client-server protocol desync

Browse Source
This commit is contained in:
antirez 2010-03-24 21:58:34 +01:00
parent 500ece7c17
commit b61a28fe35
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
redis.c
View File

@ -2187,10 +2187,6 @@ static int processCommand(redisClient *c) {
cmd->name)); cmd->name));
resetClient(c); resetClient(c);
return 1; return 1;
} else if (server.maxmemory && cmd->flags & REDIS_CMD_DENYOOM && zmalloc_used_memory() > server.maxmemory) {
addReplySds(c,sdsnew("-ERR command not allowed when used memory > 'maxmemory'\r\n"));
resetClient(c);
return 1;
} else if (cmd->flags & REDIS_CMD_BULK && c->bulklen == -1) { } else if (cmd->flags & REDIS_CMD_BULK && c->bulklen == -1) {
/* This is a bulk command, we have to read the last argument yet. */ /* This is a bulk command, we have to read the last argument yet. */
int bulklen = atoi(c->argv[c->argc-1]->ptr); int bulklen = atoi(c->argv[c->argc-1]->ptr);
@ -2236,6 +2232,15 @@ static int processCommand(redisClient *c) {
return 1; return 1;
} }
/* Handle the maxmemory directive */
if (server.maxmemory && (cmd->flags & REDIS_CMD_DENYOOM) &&
zmalloc_used_memory() > server.maxmemory)
{
addReplySds(c,sdsnew("-ERR command not allowed when used memory > 'maxmemory'\r\n"));
resetClient(c);
return 1;
}
/* Exec the command */ /* Exec the command */
if (c->flags & REDIS_MULTI && cmd->proc != execCommand && cmd->proc != discardCommand) { if (c->flags & REDIS_MULTI && cmd->proc != execCommand && cmd->proc != discardCommand) {
queueMultiCommand(c,cmd); queueMultiCommand(c,cmd);