Skip to content

Limit the number of in-memory cached blocks per store #6898

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

Closed
wants to merge 1 commit into from
Closed

Limit the number of in-memory cached blocks per store #6898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions server/filestore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ type fileStore struct {
ttls *thw.HashWheel
sdm *SDMMeta
lpex time.Time // Last PurgeEx call.
evict *ipQueue[*msgBlock]
}

// Represents a message store block and its data.
Expand Down Expand Up @@ -313,6 +314,8 @@ const (
maxBufReuse = 2 * 1024 * 1024
// default cache buffer expiration
defaultCacheBufferExpiration = 10 * time.Second
// deault cache size before eviction
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spelling

defaultCacheEvictionThreshold = 32
// default sync interval
defaultSyncInterval = 2 * time.Minute
// default idle timeout to close FDs.
Expand Down Expand Up @@ -420,6 +423,7 @@ func newFileStoreWithCreated(fcfg FileStoreConfig, cfg StreamConfig, created tim
qch: make(chan struct{}),
fsld: make(chan struct{}),
srv: fcfg.srv,
evict: newIPQueue[*msgBlock](nil, _EMPTY_),
}

// Register with access time service.
Expand Down Expand Up @@ -7058,6 +7062,14 @@ checkCache:
if len(buf) > 0 {
mb.cloads++
mb.startCacheExpireTimer()

// If loading this block into the cache caused us to reach the eviction
// threshold for cached blocks, evict the oldest one.
if n, _ := mb.fs.evict.push(mb); n == defaultCacheEvictionThreshold {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How do we remove from evict on normal cache timeout? Don't see that code.

if emb, ok := mb.fs.evict.popOne(); ok && emb != mb {
emb.tryForceExpireCache()
}
}
}

return nil
Expand Down
8 changes: 5 additions & 3 deletions server/ipqueue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,17 @@ func newIPQueue[T any](s *Server, name string, opts ...ipQueueOpt[T]) *ipQueue[T
},
},
name: name,
m: &s.ipQueues,
ipQueueOpts: ipQueueOpts[T]{
mrs: ipQueueDefaultMaxRecycleSize,
},
}
if s != nil {
q.m = &s.ipQueues
q.m.Store(name, q)
}
for _, o := range opts {
o(&q.ipQueueOpts)
}
s.ipQueues.Store(name, q)
return q
}

Expand Down Expand Up @@ -279,7 +281,7 @@ func (q *ipQueue[T]) inProgress() int64 {
// Remove this queue from the server's map of ipQueues.
// All ipQueue operations (such as push/pop/etc..) are still possible.
func (q *ipQueue[T]) unregister() {
if q == nil {
if q == nil || q.m == nil {
return
}
q.m.Delete(q.name)
Expand Down
Loading