From 6efe344587bdf0866c67c2726258713dd42cf51f Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Tue, 27 Jun 2023 14:18:14 -0700 Subject: [PATCH 01/24] port changes to 6.3 --- src/evict.cpp | 20 +++++++++++++++++++- src/server.cpp | 10 ++++++++++ src/server.h | 1 + 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/evict.cpp b/src/evict.cpp index 94bc132c1..aa6932e8b 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -421,10 +421,22 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev if (total) *total = mem_reported; size_t maxmemory = g_pserver->maxmemory; if (fPreSnapshot) - maxmemory = static_cast(maxmemory * 0.9); // derate memory by 10% since we won't be able to free during snapshot + maxmemory = static_cast(maxmemory*0.9); // derate memory by 10% since we won't be able to free during snapshot if (g_pserver->FRdbSaveInProgress()) maxmemory = static_cast(maxmemory*1.2); + /* If there is less than 10% free system memory, force eviction */ + bool mem_rss_max_exceeded; + if (g_pserver->cron_malloc_stats.sys_total) { + size_t mem_rss_max = static_cast(g_pserver->cron_malloc_stats.sys_total * 0.9); + mem_rss_max_exceeded = g_pserver->cron_malloc_stats.process_rss > mem_rss_max; + if (mem_rss_max_exceeded) { + /* This will always set maxmemory < mem_reported */ + float frag_ratio = (float)g_pserver->cron_malloc_stats.process_rss / (float)mem_reported; + maxmemory = static_cast((float)mem_rss_max / frag_ratio); + } + } + /* We may return ASAP if there is no need to compute the level. */ int return_ok_asap = !maxmemory || mem_reported <= maxmemory; if (return_ok_asap && !level) return C_OK; @@ -435,6 +447,12 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev size_t overhead = freeMemoryGetNotCountedMemory(); mem_used = (mem_used > overhead) ? mem_used-overhead : 0; + /* If we've exceeded max RSS memory, we want to force evictions no matter + * what so we also offset the overhead from maxmemory. */ + if (mem_rss_max_exceeded) { + maxmemory = (maxmemory > overhead) ? maxmemory-overhead : 0; + } + /* Compute the ratio of memory usage. */ if (level) { if (!maxmemory) { diff --git a/src/server.cpp b/src/server.cpp index 95d19459b..3e5ac7efe 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -70,6 +70,7 @@ #ifdef __linux__ #include #include +#include #endif int g_fTestMode = false; @@ -2301,6 +2302,15 @@ void cronUpdateMemoryStats() { g_pserver->cron_malloc_stats.allocator_active = g_pserver->cron_malloc_stats.allocator_resident; if (!g_pserver->cron_malloc_stats.allocator_allocated) g_pserver->cron_malloc_stats.allocator_allocated = g_pserver->cron_malloc_stats.zmalloc_used; + + #ifdef __linux__ + struct sysinfo sysinf; + memset(&sysinf, 0, sizeof sysinf); + if (!sysinfo(&sysinf)) { + g_pserver->cron_malloc_stats.sys_total = static_cast(sysinf.totalram); + } + #endif + } } diff --git a/src/server.h b/src/server.h index 022cca2dd..5f8a2e9e0 100644 --- a/src/server.h +++ b/src/server.h @@ -2009,6 +2009,7 @@ struct malloc_stats { size_t allocator_allocated; size_t allocator_active; size_t allocator_resident; + size_t sys_total; }; typedef struct socketFds { From 4e22068f2f58e27d137bc081537149d7ece957d9 Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Wed, 28 Jun 2023 17:31:40 -0700 Subject: [PATCH 02/24] with config --- src/config.cpp | 1 + src/evict.cpp | 7 ++++--- src/server.h | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/config.cpp b/src/config.cpp index 78cdb3877..129a23428 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -2953,6 +2953,7 @@ standardConfig configs[] = { createBoolConfig("soft-shutdown", NULL, MODIFIABLE_CONFIG, g_pserver->config_soft_shutdown, 0, NULL, NULL), createBoolConfig("flash-disable-key-cache", NULL, MODIFIABLE_CONFIG, g_pserver->flash_disable_key_cache, 0, NULL, NULL), createSizeTConfig("semi-ordered-set-bucket-size", NULL, MODIFIABLE_CONFIG, 0, 1024, g_semiOrderedSetTargetBucketSize, 0, INTEGER_CONFIG, NULL, NULL), + createIntConfig("force-eviction-percent", NULL, MODIFIABLE_CONFIG, 0, 100, g_pserver->force_eviction_percent, 0, INTEGER_CONFIG, NULL, NULL), #ifdef USE_OPENSSL createIntConfig("tls-port", NULL, MODIFIABLE_CONFIG, 0, 65535, g_pserver->tls_port, 0, INTEGER_CONFIG, NULL, updateTLSPort), /* TCP port. */ diff --git a/src/evict.cpp b/src/evict.cpp index aa6932e8b..2aa9337a2 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -425,10 +425,11 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev if (g_pserver->FRdbSaveInProgress()) maxmemory = static_cast(maxmemory*1.2); - /* If there is less than 10% free system memory, force eviction */ + /* If there is less than a configurable percent of free system memory, force eviction */ bool mem_rss_max_exceeded; - if (g_pserver->cron_malloc_stats.sys_total) { - size_t mem_rss_max = static_cast(g_pserver->cron_malloc_stats.sys_total * 0.9); + if (g_pserver->force_eviction_percent && g_pserver->cron_malloc_stats.sys_total) { + float sys_total_ratio = (float)(100 - g_pserver->force_eviction_percent)/100; + size_t mem_rss_max = static_cast(g_pserver->cron_malloc_stats.sys_total * sys_total_ratio); mem_rss_max_exceeded = g_pserver->cron_malloc_stats.process_rss > mem_rss_max; if (mem_rss_max_exceeded) { /* This will always set maxmemory < mem_reported */ diff --git a/src/server.h b/src/server.h index 5f8a2e9e0..6d3580339 100644 --- a/src/server.h +++ b/src/server.h @@ -2571,6 +2571,7 @@ struct redisServer { int maxmemory_policy; /* Policy for key eviction */ int maxmemory_samples; /* Precision of random sampling */ int maxmemory_eviction_tenacity;/* Aggressiveness of eviction processing */ + int force_eviction_percent; /* Force eviction when this percent of system memory is remaining */ int lfu_log_factor; /* LFU logarithmic counter factor. */ int lfu_decay_time; /* LFU counter decay factor. */ long long proto_max_bulk_len; /* Protocol bulk length maximum size. */ From e029c40fdb2e1578bba3832e249879ea13d133da Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Wed, 28 Jun 2023 23:19:34 -0700 Subject: [PATCH 03/24] revert --- keydb.conf | 5 ++--- src/evict.cpp | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/keydb.conf b/keydb.conf index 8fa711c1f..1a006fcd3 100644 --- a/keydb.conf +++ b/keydb.conf @@ -1145,9 +1145,8 @@ acllog-max-len 128 # # active-expire-effort 1 -# Force evictions when remaining total system memory reaches this percent. -# System memory is measured against RSS memory, not used memory. This is -# useful as a safeguard to prevent OOM kills when RSS overhead is +# Force evictions when RSS memory reaches this percent of total system memory. +# This is useful as a safeguard to prevent OOM kills when RSS overhead is # significant (0 to disable). # # force-eviction-percent 0 diff --git a/src/evict.cpp b/src/evict.cpp index 2aa9337a2..f4edb86fd 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -425,10 +425,10 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev if (g_pserver->FRdbSaveInProgress()) maxmemory = static_cast(maxmemory*1.2); - /* If there is less than a configurable percent of free system memory, force eviction */ + /* If rss memory exceeds configurable percent of system memory, force eviction */ bool mem_rss_max_exceeded; if (g_pserver->force_eviction_percent && g_pserver->cron_malloc_stats.sys_total) { - float sys_total_ratio = (float)(100 - g_pserver->force_eviction_percent)/100; + float sys_total_ratio = (float)(g_pserver->force_eviction_percent)/100; size_t mem_rss_max = static_cast(g_pserver->cron_malloc_stats.sys_total * sys_total_ratio); mem_rss_max_exceeded = g_pserver->cron_malloc_stats.process_rss > mem_rss_max; if (mem_rss_max_exceeded) { From 147baeeed32276229f3358a7d9858f85cb9f9468 Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Thu, 29 Jun 2023 13:22:47 -0700 Subject: [PATCH 04/24] update --- src/evict.cpp | 20 +++++++++----------- src/server.cpp | 1 + src/server.h | 1 + 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/evict.cpp b/src/evict.cpp index f4edb86fd..bd9c569ed 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -425,16 +425,14 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev if (g_pserver->FRdbSaveInProgress()) maxmemory = static_cast(maxmemory*1.2); - /* If rss memory exceeds configurable percent of system memory, force eviction */ - bool mem_rss_max_exceeded; + /* If free system memory is below a certain threshold, force eviction */ + size_t sys_free_mem_buffer; if (g_pserver->force_eviction_percent && g_pserver->cron_malloc_stats.sys_total) { - float sys_total_ratio = (float)(g_pserver->force_eviction_percent)/100; - size_t mem_rss_max = static_cast(g_pserver->cron_malloc_stats.sys_total * sys_total_ratio); - mem_rss_max_exceeded = g_pserver->cron_malloc_stats.process_rss > mem_rss_max; - if (mem_rss_max_exceeded) { - /* This will always set maxmemory < mem_reported */ - float frag_ratio = (float)g_pserver->cron_malloc_stats.process_rss / (float)mem_reported; - maxmemory = static_cast((float)mem_rss_max / frag_ratio); + float free_mem_ratio = (float)(100 - g_pserver->force_eviction_percent)/100; + size_t min_free_mem = static_cast(g_pserver->cron_malloc_stats.sys_total * free_mem_ratio); + sys_free_mem_buffer = static_cast(g_pserver->cron_malloc_stats.sys_free - min_free_mem); + if (sys_free_mem_buffer < 0) { + maxmemory = static_cast(mem_reported + sys_free_mem_buffer); } } @@ -448,9 +446,9 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev size_t overhead = freeMemoryGetNotCountedMemory(); mem_used = (mem_used > overhead) ? mem_used-overhead : 0; - /* If we've exceeded max RSS memory, we want to force evictions no matter + /* If system free memory is too low, we want to force evictions no matter * what so we also offset the overhead from maxmemory. */ - if (mem_rss_max_exceeded) { + if (sys_free_mem_buffer < 0) { maxmemory = (maxmemory > overhead) ? maxmemory-overhead : 0; } diff --git a/src/server.cpp b/src/server.cpp index 0cad2dd48..4b3169857 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2319,6 +2319,7 @@ void cronUpdateMemoryStats() { memset(&sysinf, 0, sizeof sysinf); if (!sysinfo(&sysinf)) { g_pserver->cron_malloc_stats.sys_total = static_cast(sysinf.totalram); + g_pserver->cron_malloc_stats.sys_free = static_cast(sysinf.freeram); } #endif diff --git a/src/server.h b/src/server.h index 0ad934d8d..d04aeccad 100644 --- a/src/server.h +++ b/src/server.h @@ -2015,6 +2015,7 @@ struct malloc_stats { size_t allocator_active; size_t allocator_resident; size_t sys_total; + size_t sys_free; }; typedef struct socketFds { From 4a9a9f92923246f8ac0d0e987d42017ef1688b4a Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Thu, 29 Jun 2023 13:23:16 -0700 Subject: [PATCH 05/24] update --- keydb.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keydb.conf b/keydb.conf index 1a006fcd3..8cc020fe4 100644 --- a/keydb.conf +++ b/keydb.conf @@ -1145,7 +1145,7 @@ acllog-max-len 128 # # active-expire-effort 1 -# Force evictions when RSS memory reaches this percent of total system memory. +# Force evictions when used system memory reaches X% of total system memory. # This is useful as a safeguard to prevent OOM kills when RSS overhead is # significant (0 to disable). # From 5b98a58c0ee50a11ad285855e4afc3aa909ac259 Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Thu, 29 Jun 2023 13:41:34 -0700 Subject: [PATCH 06/24] update --- src/server.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index 4b3169857..342313d12 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2315,11 +2315,13 @@ void cronUpdateMemoryStats() { g_pserver->cron_malloc_stats.allocator_allocated = g_pserver->cron_malloc_stats.zmalloc_used; #ifdef __linux__ - struct sysinfo sysinf; - memset(&sysinf, 0, sizeof sysinf); - if (!sysinfo(&sysinf)) { - g_pserver->cron_malloc_stats.sys_total = static_cast(sysinf.totalram); - g_pserver->cron_malloc_stats.sys_free = static_cast(sysinf.freeram); + if (g_pserver->force_eviction_percent) { + struct sysinfo sysinf; + memset(&sysinf, 0, sizeof sysinf); + if (!sysinfo(&sysinf)) { + g_pserver->cron_malloc_stats.sys_total = static_cast(sysinf.totalram); + g_pserver->cron_malloc_stats.sys_free = static_cast(sysinf.freeram); + } } #endif From 88b24eb68a527b39142c2b4a781d688f16e1ace5 Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Thu, 29 Jun 2023 14:21:00 -0700 Subject: [PATCH 07/24] update sys free --- src/evict.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/evict.cpp b/src/evict.cpp index bd9c569ed..6877b16f7 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -432,7 +432,8 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev size_t min_free_mem = static_cast(g_pserver->cron_malloc_stats.sys_total * free_mem_ratio); sys_free_mem_buffer = static_cast(g_pserver->cron_malloc_stats.sys_free - min_free_mem); if (sys_free_mem_buffer < 0) { - maxmemory = static_cast(mem_reported + sys_free_mem_buffer); + size_t mem_threshold = static_cast(mem_reported + sys_free_mem_buffer); + maxmemory = (maxmemory < mem_threshold) ? maxmemory : mem_threshold; } } @@ -621,6 +622,18 @@ static unsigned long evictionTimeLimitUs() { return ULONG_MAX; /* No limit to eviction time */ } +static void updateSysFreeMemory() { +#ifdef __linux__ + if (g_pserver->force_eviction_percent) { + struct sysinfo sysinf; + memset(&sysinf, 0, sizeof sysinf); + if (!sysinfo(&sysinf)) { + g_pserver->cron_malloc_stats.sys_free = static_cast(sysinf.freeram); + } + } +#endif +} + /* Check that memory usage is within the current "maxmemory" limit. If over * "maxmemory", attempt to free memory by evicting data (if it's safe to do so). * @@ -844,6 +857,7 @@ int performEvictions(bool fPreSnapshot) { * across the dbAsyncDelete() call, while the thread can * release the memory all the time. */ if (g_pserver->lazyfree_lazy_eviction) { + updateSysFreeMemory(); if (getMaxmemoryState(NULL,NULL,NULL,NULL) == C_OK) { break; } @@ -871,9 +885,13 @@ int performEvictions(bool fPreSnapshot) { if (splazy != nullptr && splazy->memory_queued() > 0 && !serverTL->gcEpoch.isReset()) { g_pserver->garbageCollector.enqueue(serverTL->gcEpoch, std::move(splazy)); - } + } cant_free: + if (mem_freed > 0) { + updateSysFreeMemory(); + } + if (g_pserver->m_pstorageFactory) { if (mem_reported < g_pserver->maxmemory*1.2) { From c894255fea16a76c5132e729bcdd5cb272900017 Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Thu, 29 Jun 2023 14:58:08 -0700 Subject: [PATCH 08/24] fix compiler errors --- src/evict.cpp | 13 ++++++++----- src/server.cpp | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/evict.cpp b/src/evict.cpp index 6877b16f7..73808c41a 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -36,6 +36,9 @@ #include #include #include +#ifdef __linux__ +#include +#endif /* ---------------------------------------------------------------------------- * Data structures @@ -426,14 +429,14 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev maxmemory = static_cast(maxmemory*1.2); /* If free system memory is below a certain threshold, force eviction */ - size_t sys_free_mem_buffer; + long sys_free_mem_buffer; if (g_pserver->force_eviction_percent && g_pserver->cron_malloc_stats.sys_total) { float free_mem_ratio = (float)(100 - g_pserver->force_eviction_percent)/100; size_t min_free_mem = static_cast(g_pserver->cron_malloc_stats.sys_total * free_mem_ratio); - sys_free_mem_buffer = static_cast(g_pserver->cron_malloc_stats.sys_free - min_free_mem); + sys_free_mem_buffer = static_cast(g_pserver->cron_malloc_stats.sys_free - min_free_mem); if (sys_free_mem_buffer < 0) { - size_t mem_threshold = static_cast(mem_reported + sys_free_mem_buffer); - maxmemory = (maxmemory < mem_threshold) ? maxmemory : mem_threshold; + long mem_threshold = mem_reported + sys_free_mem_buffer; + maxmemory = (maxmemory < mem_threshold) ? maxmemory : static_cast(mem_threshold); } } @@ -891,7 +894,7 @@ cant_free: if (mem_freed > 0) { updateSysFreeMemory(); } - + if (g_pserver->m_pstorageFactory) { if (mem_reported < g_pserver->maxmemory*1.2) { diff --git a/src/server.cpp b/src/server.cpp index 342313d12..da17da0e8 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2314,7 +2314,7 @@ void cronUpdateMemoryStats() { if (!g_pserver->cron_malloc_stats.allocator_allocated) g_pserver->cron_malloc_stats.allocator_allocated = g_pserver->cron_malloc_stats.zmalloc_used; - #ifdef __linux__ + #ifdef __linux__ if (g_pserver->force_eviction_percent) { struct sysinfo sysinf; memset(&sysinf, 0, sizeof sysinf); From d3466010678c4643fcc8e40ce85c2ffca1ba572c Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 30 Jun 2023 09:39:49 -0700 Subject: [PATCH 09/24] llu --- src/Makefile | 2 +- src/evict.cpp | 4 ++-- src/meminfo.cpp | 31 +++++++++++++++++++++++++++++++ src/server.cpp | 14 +++++--------- src/server.h | 5 ++++- 5 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 src/meminfo.cpp diff --git a/src/Makefile b/src/Makefile index 01c24b0df..007a0879d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -384,7 +384,7 @@ endif REDIS_SERVER_NAME=keydb-server$(PROG_SUFFIX) REDIS_SENTINEL_NAME=keydb-sentinel$(PROG_SUFFIX) -REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o t_nhash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o acl.o storage.o rdb-s3.o fastlock.o new.o tracking.o cron.o connection.o tls.o sha256.o motd_server.o timeout.o setcpuaffinity.o AsyncWorkQueue.o snapshot.o storage/teststorageprovider.o keydbutils.o StorageCache.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ) $(STORAGE_OBJ) +REDIS_SERVER_OBJ=adlist.o meminfo.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o t_nhash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o acl.o storage.o rdb-s3.o fastlock.o new.o tracking.o cron.o connection.o tls.o sha256.o motd_server.o timeout.o setcpuaffinity.o AsyncWorkQueue.o snapshot.o storage/teststorageprovider.o keydbutils.o StorageCache.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ) $(STORAGE_OBJ) KEYDB_SERVER_OBJ=SnapshotPayloadParseState.o REDIS_CLI_NAME=keydb-cli$(PROG_SUFFIX) REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o redis-cli-cpphelper.o zmalloc.o release.o anet.o ae.o crcspeed.o crc64.o siphash.o crc16.o storage-lite.o fastlock.o motd_client.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ) diff --git a/src/evict.cpp b/src/evict.cpp index 73808c41a..bfc923ecc 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -429,14 +429,14 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev maxmemory = static_cast(maxmemory*1.2); /* If free system memory is below a certain threshold, force eviction */ - long sys_free_mem_buffer; + long sys_free_mem_buffer = 0; if (g_pserver->force_eviction_percent && g_pserver->cron_malloc_stats.sys_total) { float free_mem_ratio = (float)(100 - g_pserver->force_eviction_percent)/100; size_t min_free_mem = static_cast(g_pserver->cron_malloc_stats.sys_total * free_mem_ratio); sys_free_mem_buffer = static_cast(g_pserver->cron_malloc_stats.sys_free - min_free_mem); if (sys_free_mem_buffer < 0) { long mem_threshold = mem_reported + sys_free_mem_buffer; - maxmemory = (maxmemory < mem_threshold) ? maxmemory : static_cast(mem_threshold); + maxmemory = ((long)maxmemory < mem_threshold) ? maxmemory : static_cast(mem_threshold); } } diff --git a/src/meminfo.cpp b/src/meminfo.cpp new file mode 100644 index 000000000..a3ec46805 --- /dev/null +++ b/src/meminfo.cpp @@ -0,0 +1,31 @@ +#include "server.h" +#include + +static size_t getMemKey(std::string key) { +# ifdef __linux__ + std::string token; + std::ifstream f("/proc/meminfo"); + while (f >> token) { + if (token == key) { + size_t mem_val; + if (f >> mem_val) { + return mem_val; + } else { + return 0; + } + f.ignore(std::numeric_limits::max(), '\n'); + } + return 0; // nothing found + } +# else + return 0; +# endif +} + +size_t getMemAvailable() { + return getMemKey("MemAvailable:"); +} + +size_t getMemTotal() { + return getMemKey("MemTotal:"); +} \ No newline at end of file diff --git a/src/server.cpp b/src/server.cpp index da17da0e8..23ac4750b 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2314,17 +2314,10 @@ void cronUpdateMemoryStats() { if (!g_pserver->cron_malloc_stats.allocator_allocated) g_pserver->cron_malloc_stats.allocator_allocated = g_pserver->cron_malloc_stats.zmalloc_used; - #ifdef __linux__ if (g_pserver->force_eviction_percent) { - struct sysinfo sysinf; - memset(&sysinf, 0, sizeof sysinf); - if (!sysinfo(&sysinf)) { - g_pserver->cron_malloc_stats.sys_total = static_cast(sysinf.totalram); - g_pserver->cron_malloc_stats.sys_free = static_cast(sysinf.freeram); - } + g_pserver->cron_malloc_stats.sys_available = getMemAvailable(); + serverLog(LL_WARNING, "Setting sys_available:%llu", g_pserver->cron_malloc_stats.sys_available); } - #endif - } } @@ -4044,6 +4037,8 @@ void initServer(void) { g_pserver->cron_malloc_stats.allocator_allocated = 0; g_pserver->cron_malloc_stats.allocator_active = 0; g_pserver->cron_malloc_stats.allocator_resident = 0; + g_pserver->cron_malloc_stats.sys_available = 0; + g_pserver->cron_malloc_stats.sys_total = g_pserver->force_eviction_percent ? getMemTotal() : 0; g_pserver->lastbgsave_status = C_OK; g_pserver->aof_last_write_status = C_OK; g_pserver->aof_last_write_errno = 0; @@ -4051,6 +4046,7 @@ void initServer(void) { g_pserver->mvcc_tstamp = 0; + /* Create the timer callback, this is our way to process many background * operations incrementally, like clients timeout, eviction of unaccessed * expired keys and so forth. */ diff --git a/src/server.h b/src/server.h index d04aeccad..475ef3ad3 100644 --- a/src/server.h +++ b/src/server.h @@ -2015,7 +2015,7 @@ struct malloc_stats { size_t allocator_active; size_t allocator_resident; size_t sys_total; - size_t sys_free; + size_t sys_available; }; typedef struct socketFds { @@ -3663,6 +3663,9 @@ unsigned long LFUDecrAndReturn(robj_roptr o); #define EVICT_FAIL 2 int performEvictions(bool fPreSnapshot); +/* meminfo.cpp -- get memory info from /proc/memoryinfo for linux distros */ +size_t getMemAvailable(); +size_t getMemTotal(); /* Keys hashing / comparison functions for dict.c hash tables. */ uint64_t dictSdsHash(const void *key); From f9978c5961cc9fc37d3297878887386ae7d7ce37 Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 30 Jun 2023 09:49:59 -0700 Subject: [PATCH 10/24] fixes --- src/evict.cpp | 18 +++++++++--------- src/meminfo.cpp | 8 ++++---- src/server.cpp | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/evict.cpp b/src/evict.cpp index bfc923ecc..780ec0b63 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -428,14 +428,14 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev if (g_pserver->FRdbSaveInProgress()) maxmemory = static_cast(maxmemory*1.2); - /* If free system memory is below a certain threshold, force eviction */ - long sys_free_mem_buffer = 0; + /* If available system memory is below a certain threshold, force eviction */ + long sys_available_mem_buffer = 0; if (g_pserver->force_eviction_percent && g_pserver->cron_malloc_stats.sys_total) { - float free_mem_ratio = (float)(100 - g_pserver->force_eviction_percent)/100; - size_t min_free_mem = static_cast(g_pserver->cron_malloc_stats.sys_total * free_mem_ratio); - sys_free_mem_buffer = static_cast(g_pserver->cron_malloc_stats.sys_free - min_free_mem); - if (sys_free_mem_buffer < 0) { - long mem_threshold = mem_reported + sys_free_mem_buffer; + float available_mem_ratio = (float)(100 - g_pserver->force_eviction_percent)/100; + size_t min_available_mem = static_cast(g_pserver->cron_malloc_stats.sys_total * available_mem_ratio); + sys_available_mem_buffer = static_cast(g_pserver->cron_malloc_stats.sys_available - min_available_mem); + if (sys_available_mem_buffer < 0) { + long mem_threshold = mem_reported + sys_available_mem_buffer; maxmemory = ((long)maxmemory < mem_threshold) ? maxmemory : static_cast(mem_threshold); } } @@ -450,9 +450,9 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev size_t overhead = freeMemoryGetNotCountedMemory(); mem_used = (mem_used > overhead) ? mem_used-overhead : 0; - /* If system free memory is too low, we want to force evictions no matter + /* If system available memory is too low, we want to force evictions no matter * what so we also offset the overhead from maxmemory. */ - if (sys_free_mem_buffer < 0) { + if (sys_available_mem_buffer < 0) { maxmemory = (maxmemory > overhead) ? maxmemory-overhead : 0; } diff --git a/src/meminfo.cpp b/src/meminfo.cpp index a3ec46805..dc9e81b93 100644 --- a/src/meminfo.cpp +++ b/src/meminfo.cpp @@ -2,7 +2,7 @@ #include static size_t getMemKey(std::string key) { -# ifdef __linux__ +// # ifdef __linux__ std::string token; std::ifstream f("/proc/meminfo"); while (f >> token) { @@ -15,11 +15,11 @@ static size_t getMemKey(std::string key) { } f.ignore(std::numeric_limits::max(), '\n'); } - return 0; // nothing found } -# else return 0; -# endif +// # else +// return 0; +// # endif } size_t getMemAvailable() { diff --git a/src/server.cpp b/src/server.cpp index 23ac4750b..a0c885c2d 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2316,7 +2316,7 @@ void cronUpdateMemoryStats() { if (g_pserver->force_eviction_percent) { g_pserver->cron_malloc_stats.sys_available = getMemAvailable(); - serverLog(LL_WARNING, "Setting sys_available:%llu", g_pserver->cron_malloc_stats.sys_available); + serverLog(LL_WARNING, "Setting sys_available:%lu", g_pserver->cron_malloc_stats.sys_available); } } } From 3e67b43a3b58590116951257aa9045d16804b40a Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 30 Jun 2023 09:53:44 -0700 Subject: [PATCH 11/24] fix --- src/meminfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meminfo.cpp b/src/meminfo.cpp index dc9e81b93..b9d9458f8 100644 --- a/src/meminfo.cpp +++ b/src/meminfo.cpp @@ -1,4 +1,4 @@ -#include "server.h" +#include #include static size_t getMemKey(std::string key) { From b3492b508415efbe82e5461170e24974494da3ba Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 30 Jun 2023 10:45:19 -0700 Subject: [PATCH 12/24] fix --- src/evict.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/evict.cpp b/src/evict.cpp index 780ec0b63..c79c2414b 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -626,15 +626,9 @@ static unsigned long evictionTimeLimitUs() { } static void updateSysFreeMemory() { -#ifdef __linux__ if (g_pserver->force_eviction_percent) { - struct sysinfo sysinf; - memset(&sysinf, 0, sizeof sysinf); - if (!sysinfo(&sysinf)) { - g_pserver->cron_malloc_stats.sys_free = static_cast(sysinf.freeram); - } + g_pserver->cron_malloc_stats.sys_available = getMemAvailable(); } -#endif } /* Check that memory usage is within the current "maxmemory" limit. If over From 4b72775a5c8b87239f794aa080c102ac7865c966 Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 30 Jun 2023 11:05:12 -0700 Subject: [PATCH 13/24] meminfo --- src/meminfo.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/meminfo.cpp b/src/meminfo.cpp index b9d9458f8..5808c05b0 100644 --- a/src/meminfo.cpp +++ b/src/meminfo.cpp @@ -2,14 +2,14 @@ #include static size_t getMemKey(std::string key) { -// # ifdef __linux__ +# ifdef __linux__ std::string token; std::ifstream f("/proc/meminfo"); while (f >> token) { if (token == key) { size_t mem_val; if (f >> mem_val) { - return mem_val; + return mem_val * 1024; // values are in kB } else { return 0; } @@ -17,9 +17,9 @@ static size_t getMemKey(std::string key) { } } return 0; -// # else -// return 0; -// # endif +# else + return 0; +# endif } size_t getMemAvailable() { From 1d53d8b75a1216b117fd6b8f61ffb2c2ee2d19e6 Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 30 Jun 2023 11:18:34 -0700 Subject: [PATCH 14/24] fix --- src/evict.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/evict.cpp b/src/evict.cpp index c79c2414b..4e42c85dd 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -429,13 +429,13 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev maxmemory = static_cast(maxmemory*1.2); /* If available system memory is below a certain threshold, force eviction */ - long sys_available_mem_buffer = 0; + long long sys_available_mem_buffer = 0; if (g_pserver->force_eviction_percent && g_pserver->cron_malloc_stats.sys_total) { float available_mem_ratio = (float)(100 - g_pserver->force_eviction_percent)/100; size_t min_available_mem = static_cast(g_pserver->cron_malloc_stats.sys_total * available_mem_ratio); sys_available_mem_buffer = static_cast(g_pserver->cron_malloc_stats.sys_available - min_available_mem); if (sys_available_mem_buffer < 0) { - long mem_threshold = mem_reported + sys_available_mem_buffer; + long long mem_threshold = mem_reported + sys_available_mem_buffer; maxmemory = ((long)maxmemory < mem_threshold) ? maxmemory : static_cast(mem_threshold); } } From 3e528f261934c29828e5eb268fbe5823cc457875 Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 30 Jun 2023 11:20:29 -0700 Subject: [PATCH 15/24] clean --- keydb.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keydb.conf b/keydb.conf index 8cc020fe4..02e97d4be 100644 --- a/keydb.conf +++ b/keydb.conf @@ -1146,8 +1146,7 @@ acllog-max-len 128 # active-expire-effort 1 # Force evictions when used system memory reaches X% of total system memory. -# This is useful as a safeguard to prevent OOM kills when RSS overhead is -# significant (0 to disable). +# This is useful as a safeguard to prevent OOM kills (0 to disable). # # force-eviction-percent 0 From 5237d29dc1e42f3ae7e8d90345365bed568a43bc Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 30 Jun 2023 11:21:18 -0700 Subject: [PATCH 16/24] fix --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 007a0879d..a3cd741f4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -384,7 +384,7 @@ endif REDIS_SERVER_NAME=keydb-server$(PROG_SUFFIX) REDIS_SENTINEL_NAME=keydb-sentinel$(PROG_SUFFIX) -REDIS_SERVER_OBJ=adlist.o meminfo.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o t_nhash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o acl.o storage.o rdb-s3.o fastlock.o new.o tracking.o cron.o connection.o tls.o sha256.o motd_server.o timeout.o setcpuaffinity.o AsyncWorkQueue.o snapshot.o storage/teststorageprovider.o keydbutils.o StorageCache.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ) $(STORAGE_OBJ) +REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o t_nhash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o acl.o storage.o rdb-s3.o fastlock.o new.o tracking.o cron.o connection.o tls.o sha256.o motd_server.o timeout.o setcpuaffinity.o AsyncWorkQueue.o snapshot.o storage/teststorageprovider.o keydbutils.o StorageCache.o monotonic.o cli_common.o mt19937-64.o meminfo.o $(ASM_OBJ) $(STORAGE_OBJ) KEYDB_SERVER_OBJ=SnapshotPayloadParseState.o REDIS_CLI_NAME=keydb-cli$(PROG_SUFFIX) REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o redis-cli-cpphelper.o zmalloc.o release.o anet.o ae.o crcspeed.o crc64.o siphash.o crc16.o storage-lite.o fastlock.o motd_client.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ) From 01b7bc4cc159e86ff446216519c66d22d3ad33f2 Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 30 Jun 2023 11:21:55 -0700 Subject: [PATCH 17/24] fix --- src/evict.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/evict.cpp b/src/evict.cpp index 4e42c85dd..35d809e62 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -436,7 +436,7 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev sys_available_mem_buffer = static_cast(g_pserver->cron_malloc_stats.sys_available - min_available_mem); if (sys_available_mem_buffer < 0) { long long mem_threshold = mem_reported + sys_available_mem_buffer; - maxmemory = ((long)maxmemory < mem_threshold) ? maxmemory : static_cast(mem_threshold); + maxmemory = ((long long)maxmemory < mem_threshold) ? maxmemory : static_cast(mem_threshold); } } From e80ff9ec709a38b31936f4de758061e471a37b53 Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 30 Jun 2023 11:23:00 -0700 Subject: [PATCH 18/24] fix --- src/evict.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/evict.cpp b/src/evict.cpp index 35d809e62..6c211e444 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -625,7 +625,7 @@ static unsigned long evictionTimeLimitUs() { return ULONG_MAX; /* No limit to eviction time */ } -static void updateSysFreeMemory() { +static void updateSysAvailableMemory() { if (g_pserver->force_eviction_percent) { g_pserver->cron_malloc_stats.sys_available = getMemAvailable(); } @@ -854,7 +854,7 @@ int performEvictions(bool fPreSnapshot) { * across the dbAsyncDelete() call, while the thread can * release the memory all the time. */ if (g_pserver->lazyfree_lazy_eviction) { - updateSysFreeMemory(); + updateSysAvailableMemory(); if (getMaxmemoryState(NULL,NULL,NULL,NULL) == C_OK) { break; } @@ -886,7 +886,7 @@ int performEvictions(bool fPreSnapshot) { cant_free: if (mem_freed > 0) { - updateSysFreeMemory(); + updateSysAvailableMemory(); } if (g_pserver->m_pstorageFactory) From 184185a633af0288ee1557e416373db0e1a7ea5b Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 30 Jun 2023 11:23:43 -0700 Subject: [PATCH 19/24] fix --- src/server.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/server.cpp b/src/server.cpp index a0c885c2d..517e4ee1e 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2316,7 +2316,6 @@ void cronUpdateMemoryStats() { if (g_pserver->force_eviction_percent) { g_pserver->cron_malloc_stats.sys_available = getMemAvailable(); - serverLog(LL_WARNING, "Setting sys_available:%lu", g_pserver->cron_malloc_stats.sys_available); } } } From e6bc1c5585254db6095b4fdcff45bde714874f3f Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Thu, 6 Jul 2023 15:22:52 -0700 Subject: [PATCH 20/24] ok --- src/server.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index 517e4ee1e..8ab67ad40 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -5737,6 +5737,7 @@ sds genRedisInfoString(const char *section) { const char *evict_policy = evictPolicyToString(); long long memory_lua = g_pserver->lua ? (long long)lua_gc(g_pserver->lua,LUA_GCCOUNT,0)*1024 : 0; struct redisMemOverhead *mh = getMemoryOverheadData(); + char available_system_mem[64] = "unavailable"; /* Peak memory is updated from time to time by serverCron() so it * may happen that the instantaneous value is slightly bigger than @@ -5745,6 +5746,10 @@ sds genRedisInfoString(const char *section) { if (zmalloc_used > g_pserver->stat_peak_memory) g_pserver->stat_peak_memory = zmalloc_used; + if (g_pserver->cron_malloc_stats.sys_available) { + snprintf(available_system_mem, 64, "%lu", g_pserver->cron_malloc_stats.sys_available); + } + bytesToHuman(hmem,zmalloc_used,sizeof(hmem)); bytesToHuman(peak_hmem,g_pserver->stat_peak_memory,sizeof(peak_hmem)); bytesToHuman(total_system_hmem,total_system_mem,sizeof(total_system_hmem)); @@ -5797,7 +5802,8 @@ sds genRedisInfoString(const char *section) { "active_defrag_running:%d\r\n" "lazyfree_pending_objects:%zu\r\n" "lazyfreed_objects:%zu\r\n" - "storage_provider:%s\r\n", + "storage_provider:%s\r\n" + "available_system_memory:%s\r\n", zmalloc_used, hmem, g_pserver->cron_malloc_stats.process_rss, @@ -5842,7 +5848,8 @@ sds genRedisInfoString(const char *section) { g_pserver->active_defrag_running, lazyfreeGetPendingObjectsCount(), lazyfreeGetFreedObjectsCount(), - g_pserver->m_pstorageFactory ? g_pserver->m_pstorageFactory->name() : "none" + g_pserver->m_pstorageFactory ? g_pserver->m_pstorageFactory->name() : "none", + available_system_mem ); freeMemoryOverheadData(mh); } From 1c8f1a0931628fd8888677214ea19f095c56502a Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 7 Jul 2023 07:37:07 -0700 Subject: [PATCH 21/24] modify --- src/evict.cpp | 18 ++++++++++++++---- src/server.h | 5 ++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/evict.cpp b/src/evict.cpp index 6c211e444..cf5046567 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -414,8 +414,13 @@ size_t freeMemoryGetNotCountedMemory(void) { * memory currently used. May be > 1 if we are over the memory * limit. * (Populated both for C_ERR and C_OK) + * + * 'reason' the reason why the memory limit was exceeded + * EVICT_REASON_USER: reported user memory exceeded maxmemory + * EVICT_REASON_SYS: available system memory under configurable threshold + * (Populated when C_ERR is returned) */ -int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, bool fQuickCycle, bool fPreSnapshot) { +int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, int *reason, bool fQuickCycle, bool fPreSnapshot) { size_t mem_reported, mem_used, mem_tofree; /* Check if we are over the memory usage limit. If we are not, no need @@ -480,6 +485,8 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev if (logical) *logical = mem_used; if (tofree) *tofree = mem_tofree; + if (reason) *reason = sys_available_mem_buffer < 0 ? EVICT_REASON_SYS : EVICT_REASON_USER; + return C_ERR; } @@ -668,10 +675,11 @@ int performEvictions(bool fPreSnapshot) { const bool fEvictToStorage = !cserver.delete_on_evict && g_pserver->db[0]->FStorageProvider(); int result = EVICT_FAIL; int ckeysFailed = 0; + int evictReason; std::unique_ptr splazy = std::make_unique(); - if (getMaxmemoryState(&mem_reported,NULL,&mem_tofree,NULL,false,fPreSnapshot) == C_OK) + if (getMaxmemoryState(&mem_reported,NULL,&mem_tofree,NULL,&evictReason,false,fPreSnapshot) == C_OK) return EVICT_OK; if (g_pserver->maxmemory_policy == MAXMEMORY_NO_EVICTION) @@ -854,7 +862,9 @@ int performEvictions(bool fPreSnapshot) { * across the dbAsyncDelete() call, while the thread can * release the memory all the time. */ if (g_pserver->lazyfree_lazy_eviction) { - updateSysAvailableMemory(); + if (evictReason == EVICT_REASON_SYS) { + updateSysAvailableMemory(); + } if (getMaxmemoryState(NULL,NULL,NULL,NULL) == C_OK) { break; } @@ -885,7 +895,7 @@ int performEvictions(bool fPreSnapshot) { } cant_free: - if (mem_freed > 0) { + if (mem_freed > 0 && evictReason == EVICT_REASON_SYS) { updateSysAvailableMemory(); } diff --git a/src/server.h b/src/server.h index 475ef3ad3..5d415265c 100644 --- a/src/server.h +++ b/src/server.h @@ -3378,7 +3378,7 @@ int zslLexValueGteMin(sds value, zlexrangespec *spec); int zslLexValueLteMax(sds value, zlexrangespec *spec); /* Core functions */ -int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, bool fQuickCycle = false, bool fPreSnapshot=false); +int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, int *reason=NULL, bool fQuickCycle=false, bool fPreSnapshot=false); size_t freeMemoryGetNotCountedMemory(); int overMaxmemoryAfterAlloc(size_t moremem); int processCommand(client *c, int callFlags); @@ -3662,6 +3662,9 @@ unsigned long LFUDecrAndReturn(robj_roptr o); #define EVICT_RUNNING 1 #define EVICT_FAIL 2 int performEvictions(bool fPreSnapshot); +#define EVICT_REASON_NONE 0 +#define EVICT_REASON_USER 1 +#define EVICT_REASON_SYS 2 /* meminfo.cpp -- get memory info from /proc/memoryinfo for linux distros */ size_t getMemAvailable(); From e35ce24985f058a84da25805312116273be3f173 Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 7 Jul 2023 11:07:33 -0700 Subject: [PATCH 22/24] use enum class --- src/evict.cpp | 15 ++++++++++----- src/server.h | 3 --- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/evict.cpp b/src/evict.cpp index cf5046567..0f8c2bf6b 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -66,6 +66,11 @@ struct evictionPoolEntry { static struct evictionPoolEntry *EvictionPoolLRU; +enum class EvictReason { + User, /* User memory exceeded limit */ + System /* System memory exceeded limit */ +}; + /* ---------------------------------------------------------------------------- * Implementation of eviction, aging and LRU * --------------------------------------------------------------------------*/ @@ -420,7 +425,7 @@ size_t freeMemoryGetNotCountedMemory(void) { * EVICT_REASON_SYS: available system memory under configurable threshold * (Populated when C_ERR is returned) */ -int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, int *reason, bool fQuickCycle, bool fPreSnapshot) { +int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, EvictReason *reason, bool fQuickCycle, bool fPreSnapshot) { size_t mem_reported, mem_used, mem_tofree; /* Check if we are over the memory usage limit. If we are not, no need @@ -485,7 +490,7 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev if (logical) *logical = mem_used; if (tofree) *tofree = mem_tofree; - if (reason) *reason = sys_available_mem_buffer < 0 ? EVICT_REASON_SYS : EVICT_REASON_USER; + if (reason) *reason = sys_available_mem_buffer < 0 ? EvictReason::System : EvictReason::User; return C_ERR; } @@ -675,7 +680,7 @@ int performEvictions(bool fPreSnapshot) { const bool fEvictToStorage = !cserver.delete_on_evict && g_pserver->db[0]->FStorageProvider(); int result = EVICT_FAIL; int ckeysFailed = 0; - int evictReason; + EvictReason evictReason; std::unique_ptr splazy = std::make_unique(); @@ -862,7 +867,7 @@ int performEvictions(bool fPreSnapshot) { * across the dbAsyncDelete() call, while the thread can * release the memory all the time. */ if (g_pserver->lazyfree_lazy_eviction) { - if (evictReason == EVICT_REASON_SYS) { + if (evictReason == EvictReason::System) { updateSysAvailableMemory(); } if (getMaxmemoryState(NULL,NULL,NULL,NULL) == C_OK) { @@ -895,7 +900,7 @@ int performEvictions(bool fPreSnapshot) { } cant_free: - if (mem_freed > 0 && evictReason == EVICT_REASON_SYS) { + if (mem_freed > 0 && evictReason == EvictReason::System) { updateSysAvailableMemory(); } diff --git a/src/server.h b/src/server.h index 5d415265c..612165c0f 100644 --- a/src/server.h +++ b/src/server.h @@ -3662,9 +3662,6 @@ unsigned long LFUDecrAndReturn(robj_roptr o); #define EVICT_RUNNING 1 #define EVICT_FAIL 2 int performEvictions(bool fPreSnapshot); -#define EVICT_REASON_NONE 0 -#define EVICT_REASON_USER 1 -#define EVICT_REASON_SYS 2 /* meminfo.cpp -- get memory info from /proc/memoryinfo for linux distros */ size_t getMemAvailable(); From c0c9230c73224f5364c7e23ddeee0e42991e5f8e Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 7 Jul 2023 11:37:09 -0700 Subject: [PATCH 23/24] fix compile error --- src/evict.cpp | 8 -------- src/server.h | 8 +++++++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/evict.cpp b/src/evict.cpp index 0f8c2bf6b..740a6d2b2 100644 --- a/src/evict.cpp +++ b/src/evict.cpp @@ -36,9 +36,6 @@ #include #include #include -#ifdef __linux__ -#include -#endif /* ---------------------------------------------------------------------------- * Data structures @@ -66,11 +63,6 @@ struct evictionPoolEntry { static struct evictionPoolEntry *EvictionPoolLRU; -enum class EvictReason { - User, /* User memory exceeded limit */ - System /* System memory exceeded limit */ -}; - /* ---------------------------------------------------------------------------- * Implementation of eviction, aging and LRU * --------------------------------------------------------------------------*/ diff --git a/src/server.h b/src/server.h index 612165c0f..047834ae2 100644 --- a/src/server.h +++ b/src/server.h @@ -2874,6 +2874,12 @@ typedef struct { #define OBJ_HASH_KEY 1 #define OBJ_HASH_VALUE 2 +/* Used in evict.cpp */ +enum class EvictReason { + User, /* User memory exceeded limit */ + System /* System memory exceeded limit */ +}; + /*----------------------------------------------------------------------------- * Extern declarations *----------------------------------------------------------------------------*/ @@ -3378,7 +3384,7 @@ int zslLexValueGteMin(sds value, zlexrangespec *spec); int zslLexValueLteMax(sds value, zlexrangespec *spec); /* Core functions */ -int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, int *reason=NULL, bool fQuickCycle=false, bool fPreSnapshot=false); +int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, EvictReason *reason=NULL, bool fQuickCycle=false, bool fPreSnapshot=false); size_t freeMemoryGetNotCountedMemory(); int overMaxmemoryAfterAlloc(size_t moremem); int processCommand(client *c, int callFlags); From 970e594dca26291254cc2f0efa4b1e6976deb9cb Mon Sep 17 00:00:00 2001 From: Alex Cope Date: Fri, 7 Jul 2023 11:55:49 -0700 Subject: [PATCH 24/24] nullptr --- src/server.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server.h b/src/server.h index 047834ae2..9ad1aab8d 100644 --- a/src/server.h +++ b/src/server.h @@ -3384,7 +3384,7 @@ int zslLexValueGteMin(sds value, zlexrangespec *spec); int zslLexValueLteMax(sds value, zlexrangespec *spec); /* Core functions */ -int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, EvictReason *reason=NULL, bool fQuickCycle=false, bool fPreSnapshot=false); +int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, EvictReason *reason=nullptr, bool fQuickCycle=false, bool fPreSnapshot=false); size_t freeMemoryGetNotCountedMemory(); int overMaxmemoryAfterAlloc(size_t moremem); int processCommand(client *c, int callFlags);