From 12a88d575d2cdd1fb36c8eef043f1f7e6fdd5246 Mon Sep 17 00:00:00 2001 From: antirez Date: Mon, 3 Mar 2014 11:19:54 +0100 Subject: [PATCH] Document why we update peak memory in INFO. --- src/redis.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/redis.c b/src/redis.c index fe32c8def..eb47616dc 100644 --- a/src/redis.c +++ b/src/redis.c @@ -2409,9 +2409,12 @@ sds genRedisInfoString(char *section) { char peak_hmem[64]; size_t zmalloc_used = zmalloc_used_memory(); - if (zmalloc_used > server.stat_peak_memory) { + /* Peak memory is updated from time to time by serverCron() so it + * may happen that the instantaneous value is slightly bigger than + * the peak value. This may confuse users, so we update the peak + * if found smaller than the current memory usage. */ + if (zmalloc_used > server.stat_peak_memory) server.stat_peak_memory = zmalloc_used; - } bytesToHuman(hmem,zmalloc_used); bytesToHuman(peak_hmem,server.stat_peak_memory);