fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-08 18:38:04 +00:00
Code Issues Projects Releases Wiki Activity

Better variable meaning in processCommand().

Browse Source
This commit is contained in:
antirez 2018-08-27 11:57:44 +02:00
parent 66b5afdaa4
commit abf52c7cf4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server.c
View File

@ -2594,14 +2594,14 @@ int processCommand(client *c) {
* keys in the dataset). If there are not the only thing we can do * keys in the dataset). If there are not the only thing we can do
* is returning an error. */ * is returning an error. */
if (server.maxmemory) { if (server.maxmemory) {
int retval = freeMemoryIfNeeded(); int out_of_memory = freeMemoryIfNeeded() == C_ERR;
/* freeMemoryIfNeeded may flush slave output buffers. This may result /* freeMemoryIfNeeded may flush slave output buffers. This may result
* into a slave, that may be the active client, to be freed. */ * into a slave, that may be the active client, to be freed. */
if (server.current_client == NULL) return C_ERR; if (server.current_client == NULL) return C_ERR;
/* It was impossible to free enough memory, and the command the client /* It was impossible to free enough memory, and the command the client
* is trying to execute is denied during OOM conditions? Error. */ * is trying to execute is denied during OOM conditions? Error. */
if ((c->cmd->flags & CMD_DENYOOM) && retval == C_ERR) { if ((c->cmd->flags & CMD_DENYOOM) && out_of_memory) {
flagTransaction(c); flagTransaction(c);
addReply(c, shared.oomerr); addReply(c, shared.oomerr);
return C_OK; return C_OK;