From 00adf18c2470a69c255ea75990bbbae6e57eea89 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Thu, 3 Aug 2023 10:34:35 +0100 Subject: [feature] simpler cache size configuration (#2051) * add automatic cache max size generation based on ratios of a singular fixed memory target Signed-off-by: kim * remove now-unused cache max-size config variables Signed-off-by: kim * slight ratio tweak Signed-off-by: kim * remove unused visibility config var Signed-off-by: kim * add secret little ratio config trick Signed-off-by: kim * fixed a word Signed-off-by: kim * update cache library to remove use of TTL in result caches + slice cache Signed-off-by: kim * update other cache usages to use correct interface Signed-off-by: kim * update example config to explain the cache memory target Signed-off-by: kim * update env parsing test with new config values Signed-off-by: kim * do some ratio twiddling Signed-off-by: kim * add missing header * update envparsing with latest defaults Signed-off-by: kim * update size calculations to take into account result cache, simple cache and extra map overheads Signed-off-by: kim * tweak the ratios some more Signed-off-by: kim * more nan rampaging Signed-off-by: kim * fix envparsing script Signed-off-by: kim * update cache library, add sweep function to keep caches trim Signed-off-by: kim * sweep caches once a minute Signed-off-by: kim * add a regular job to sweep caches and keep under 80% utilisation Signed-off-by: kim * remove dead code Signed-off-by: kim * add new size library used to libraries section of readme Signed-off-by: kim * add better explanations for the mem-ratio numbers Signed-off-by: kim * update go-cache Signed-off-by: kim * library version bump Signed-off-by: kim * update cache.result{} size model estimation Signed-off-by: kim --------- Signed-off-by: kim --- internal/cache/util.go | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'internal/cache/util.go') diff --git a/internal/cache/util.go b/internal/cache/util.go index f2357c904..f15922401 100644 --- a/internal/cache/util.go +++ b/internal/cache/util.go @@ -20,10 +20,8 @@ package cache import ( "database/sql" "errors" - "fmt" "time" - "codeberg.org/gruf/go-cache/v3/result" errorsv2 "codeberg.org/gruf/go-errors/v2" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/log" @@ -56,26 +54,6 @@ func (*nocopy) Lock() {} func (*nocopy) Unlock() {} -// tryStart will attempt to start the given cache only if sweep duration > 0 (sweeping is enabled). -func tryStart[ValueType any](cache *result.Cache[ValueType], sweep time.Duration) { - if sweep > 0 { - var z ValueType - msg := fmt.Sprintf("starting %T cache", z) - tryUntil(msg, 5, func() bool { - return cache.Start(sweep) - }) - } -} - -// tryStop will attempt to stop the given cache only if sweep duration > 0 (sweeping is enabled). -func tryStop[ValueType any](cache *result.Cache[ValueType], sweep time.Duration) { - if sweep > 0 { - var z ValueType - msg := fmt.Sprintf("stopping %T cache", z) - tryUntil(msg, 5, cache.Stop) - } -} - // tryUntil will attempt to call 'do' for 'count' attempts, before panicking with 'msg'. func tryUntil(msg string, count int, do func() bool) { for i := 0; i < count; i++ { -- cgit v1.2.3