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

fix(blooms): Fix eviction of multiple blockcache items #13573

Merged
merged 1 commit into from
Jul 18, 2024
+21 −11
Merged

fix(blooms): Fix eviction of multiple blockcache items #13573

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
7 changes: 6 additions & 1 deletion pkg/storage/stores/shipper/bloomshipper/blockscache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,10 @@ func (c *BlocksCache) put(key string, value BlockDirectory) (*Entry, error) {

func (c *BlocksCache) evict(key string, element *list.Element, reason string) {
entry := element.Value.(*Entry)
if key != entry.Key {
level.Error(c.logger).Log("msg", "failed to remove entry: entry key and map key do not match", "map_key", key, "entry_key", entry.Key)
return
}
err := c.remove(entry)
if err != nil {
level.Error(c.logger).Log("msg", "failed to remove entry from disk", "err", err)
Expand Down Expand Up @@ -400,6 +404,7 @@ func (c *BlocksCache) evictLeastRecentlyUsedItems() {
)
elem := c.lru.Back()
for c.currSizeBytes >= int64(c.cfg.SoftLimit) && elem != nil {
nextElem := elem.Prev()
entry := elem.Value.(*Entry)
if entry.refCount.Load() == 0 {
level.Debug(c.logger).Log(
Expand All @@ -408,7 +413,7 @@ func (c *BlocksCache) evictLeastRecentlyUsedItems() {
)
c.evict(entry.Key, elem, reasonFull)
}
elem = elem.Prev()
elem = nextElem
}
}

Expand Down
25 changes: 15 additions & 10 deletions pkg/storage/stores/shipper/bloomshipper/blockscache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ func TestBlocksCache_TTLEviction(t *testing.T) {
func TestBlocksCache_LRUEviction(t *testing.T) {
cfg := config.BlocksCacheConfig{
TTL: time.Hour,
SoftLimit: flagext.Bytes(15),
HardLimit: flagext.Bytes(20),
SoftLimit: flagext.Bytes(25),
HardLimit: flagext.Bytes(50),
// no need for TTL evictions
PurgeInterval: time.Minute,
}
Expand All @@ -216,27 +216,32 @@ func TestBlocksCache_LRUEviction(t *testing.T) {
// oldest without refcount - will be evicted
err = cache.Put(ctx, "c", CacheValue("c", 4))
require.NoError(t, err)
err = cache.Put(ctx, "d", CacheValue("d", 4))
require.NoError(t, err)
err = cache.Put(ctx, "e", CacheValue("e", 4))
require.NoError(t, err)
err = cache.Put(ctx, "f", CacheValue("f", 4))
require.NoError(t, err)

// increase ref counter on "b"
_, found := cache.Get(ctx, "b")
require.True(t, found)

// exceed soft limit
err = cache.Put(ctx, "d", CacheValue("d", 4))
err = cache.Put(ctx, "g", CacheValue("g", 16))
require.NoError(t, err)

time.Sleep(time.Second)

l, ok := cache.len()
require.True(t, ok)
require.Equal(t, 3, l)

// key "b" was evicted because it was the oldest
// and it had no ref counts
_, found = cache.Get(ctx, "c")
require.False(t, found)

require.Equal(t, int64(12), cache.currSizeBytes)
// expect 3 items in cache:
// * item a with size 4
// * item b with size 4
// * item g with size 16
require.Equal(t, 3, l)
require.Equal(t, int64(24), cache.currSizeBytes)
}

func TestBlocksCache_RefCounter(t *testing.T) {
Expand Down
Loading