From f4b27ae22272b9a50e970aa308ba57c3c3dbd985 Mon Sep 17 00:00:00 2001 From: Oran Agra Date: Mon, 13 Aug 2018 17:36:54 +0300 Subject: [PATCH] script cache memory in INFO and MEMORY includes both script code and overheads --- src/object.c | 2 +- src/server.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/object.c b/src/object.c index 40681614..90ccbc91 100644 --- a/src/object.c +++ b/src/object.c @@ -1017,7 +1017,7 @@ struct redisMemOverhead *getMemoryOverheadData(void) { mh->aof_buffer = mem; mem_total+=mem; - mem = 0; + mem = server.lua_scripts_mem; mem += dictSize(server.lua_scripts) * sizeof(dictEntry) + dictSlots(server.lua_scripts) * sizeof(dictEntry*); mem += dictSize(server.repl_scriptcache_dict) * sizeof(dictEntry) + diff --git a/src/server.c b/src/server.c index b537ee04..726147bf 100644 --- a/src/server.c +++ b/src/server.c @@ -3186,7 +3186,7 @@ sds genRedisInfoString(char *section) { bytesToHuman(peak_hmem,server.stat_peak_memory); bytesToHuman(total_system_hmem,total_system_mem); bytesToHuman(used_memory_lua_hmem,memory_lua); - bytesToHuman(used_memory_scripts_hmem,server.lua_scripts_mem); + bytesToHuman(used_memory_scripts_hmem,mh->lua_caches); bytesToHuman(used_memory_rss_hmem,server.cron_malloc_stats.process_rss); bytesToHuman(maxmemory_hmem,server.maxmemory); @@ -3251,7 +3251,7 @@ sds genRedisInfoString(char *section) { total_system_hmem, memory_lua, used_memory_lua_hmem, - server.lua_scripts_mem, + mh->lua_caches, used_memory_scripts_hmem, dictSize(server.lua_scripts), server.maxmemory,