Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bugfix] fix inconsistent calculated cache sizes #2115

Merged
merged 4 commits into from
Aug 14, 2023
Merged

[bugfix] fix inconsistent calculated cache sizes #2115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0b7f4a
use calculated exampleTime instead of `time.Now()` to ensure no local…
NyaaaWhatsUpDoc Aug 14, 2023
d67be77
update envparsing test
NyaaaWhatsUpDoc Aug 14, 2023
9cf2dd7
update default cache memory to 100MiB
NyaaaWhatsUpDoc Aug 14, 2023
3b1691c
fix envparsing with latest cache target default
NyaaaWhatsUpDoc Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions example/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@ cache:
# within. This is based on estimated sizes of
# in-memory objects, and so NOT AT ALL EXACT.
# Examples: ["100MiB", "200MiB", "500MiB", "1GiB"]
# Default: "200MiB"
memory-target: "200MiB"
# Default: "100MiB"
memory-target: "100MiB"

######################
##### WEB CONFIG #####
Expand Down
58 changes: 30 additions & 28 deletions internal/cache/gts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ func (c *GTSCaches) initAccount() {
config.GetCacheAccountMemRatio(),
)

log.Infof(nil, "Account cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.account = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -296,7 +296,8 @@ func (c *GTSCaches) initAccountNote() {
sizeofAccountNote(), // model in-mem size.
config.GetCacheAccountNoteMemRatio(),
)
log.Infof(nil, "AccountNote cache size = %d", cap)

log.Infof(nil, "cache size = %d", cap)

c.accountNote = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -316,7 +317,8 @@ func (c *GTSCaches) initApplication() {
sizeofApplication(), // model in-mem size.
config.GetCacheApplicationMemRatio(),
)
log.Infof(nil, "Application cache size = %d", cap)

log.Infof(nil, "cache size = %d", cap)

c.application = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -337,7 +339,7 @@ func (c *GTSCaches) initBlock() {
config.GetCacheBlockMemRatio(),
)

log.Infof(nil, "Block cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.block = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -360,7 +362,7 @@ func (c *GTSCaches) initBlockIDs() {
config.GetCacheBlockIDsMemRatio(),
)

log.Infof(nil, "Block IDs cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.blockIDs = &SliceCache[string]{Cache: simple.New[string, []string](
0,
Expand All @@ -374,7 +376,7 @@ func (c *GTSCaches) initBoostOfIDs() {
config.GetCacheBoostOfIDsMemRatio(),
)

log.Infof(nil, "BoostofIDs cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.boostOfIDs = &SliceCache[string]{Cache: simple.New[string, []string](
0,
Expand All @@ -393,7 +395,7 @@ func (c *GTSCaches) initEmoji() {
config.GetCacheEmojiMemRatio(),
)

log.Infof(nil, "Emoji cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.emoji = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -417,7 +419,7 @@ func (c *GTSCaches) initEmojiCategory() {
config.GetCacheEmojiCategoryMemRatio(),
)

log.Infof(nil, "EmojiCategory cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.emojiCategory = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -438,7 +440,7 @@ func (c *GTSCaches) initFollow() {
config.GetCacheFollowMemRatio(),
)

log.Infof(nil, "Follow cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.follow = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -461,7 +463,7 @@ func (c *GTSCaches) initFollowIDs() {
config.GetCacheFollowIDsMemRatio(),
)

log.Infof(nil, "Follow IDs cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.followIDs = &SliceCache[string]{Cache: simple.New[string, []string](
0,
Expand All @@ -476,7 +478,7 @@ func (c *GTSCaches) initFollowRequest() {
config.GetCacheFollowRequestMemRatio(),
)

log.Infof(nil, "FollowRequest cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.followRequest = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -499,7 +501,7 @@ func (c *GTSCaches) initFollowRequestIDs() {
config.GetCacheFollowRequestIDsMemRatio(),
)

log.Infof(nil, "Follow Request IDs cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.followRequestIDs = &SliceCache[string]{Cache: simple.New[string, []string](
0,
Expand All @@ -513,7 +515,7 @@ func (c *GTSCaches) initInReplyToIDs() {
config.GetCacheInReplyToIDsMemRatio(),
)

log.Infof(nil, "InReplyTo IDs cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.inReplyToIDs = &SliceCache[string]{Cache: simple.New[string, []string](
0,
Expand All @@ -528,7 +530,7 @@ func (c *GTSCaches) initInstance() {
config.GetCacheInstanceMemRatio(),
)

log.Infof(nil, "Instance cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.instance = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -549,7 +551,7 @@ func (c *GTSCaches) initList() {
config.GetCacheListMemRatio(),
)

log.Infof(nil, "List cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.list = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -569,7 +571,7 @@ func (c *GTSCaches) initListEntry() {
config.GetCacheListEntryMemRatio(),
)

log.Infof(nil, "ListEntry cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.listEntry = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -591,7 +593,7 @@ func (c *GTSCaches) initMarker() {
config.GetCacheMarkerMemRatio(),
)

log.Infof(nil, "Marker cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.marker = result.New([]result.Lookup{
{Name: "AccountID.Name"},
Expand All @@ -611,7 +613,7 @@ func (c *GTSCaches) initMedia() {
config.GetCacheMediaMemRatio(),
)

log.Infof(nil, "Media cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.media = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -631,7 +633,7 @@ func (c *GTSCaches) initMention() {
config.GetCacheMentionMemRatio(),
)

log.Infof(nil, "Mention cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.mention = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -651,7 +653,7 @@ func (c *GTSCaches) initNotification() {
config.GetCacheNotificationMemRatio(),
)

log.Infof(nil, "Notification cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.notification = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -672,7 +674,7 @@ func (c *GTSCaches) initReport() {
config.GetCacheReportMemRatio(),
)

log.Infof(nil, "Report cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.report = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -692,7 +694,7 @@ func (c *GTSCaches) initStatus() {
config.GetCacheStatusMemRatio(),
)

log.Infof(nil, "Status cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.status = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -715,7 +717,7 @@ func (c *GTSCaches) initStatusFave() {
config.GetCacheStatusFaveMemRatio(),
)

log.Infof(nil, "StatusFave cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.statusFave = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -736,7 +738,7 @@ func (c *GTSCaches) initStatusFaveIDs() {
config.GetCacheStatusFaveIDsMemRatio(),
)

log.Infof(nil, "StatusFave IDs cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.statusFaveIDs = &SliceCache[string]{Cache: simple.New[string, []string](
0,
Expand All @@ -751,7 +753,7 @@ func (c *GTSCaches) initTag() {
config.GetCacheTagMemRatio(),
)

log.Infof(nil, "Tag cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.tag = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -772,7 +774,7 @@ func (c *GTSCaches) initTombstone() {
config.GetCacheTombstoneMemRatio(),
)

log.Infof(nil, "Tombstone cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.tombstone = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -793,7 +795,7 @@ func (c *GTSCaches) initUser() {
config.GetCacheUserMemRatio(),
)

log.Infof(nil, "User cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.user = result.New([]result.Lookup{
{Name: "ID"},
Expand All @@ -817,7 +819,7 @@ func (c *GTSCaches) initWebfinger() {
config.GetCacheWebfingerMemRatio(),
)

log.Infof(nil, "Webfinger cache size = %d", cap)
log.Infof(nil, "cache size = %d", cap)

c.webfinger = ttl.New[string, string](
0,
Expand Down
Loading