Fix concurrent cache write (#5623)

Signed-off-by: Changxin Miao <[email protected]>
juicedata · Feb 10, 2025 · ab17da2 · ab17da2
1 parent 08d5d82
commit ab17da2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/chunk/disk_cache.go b/pkg/chunk/disk_cache.go
@@ -414,6 +414,10 @@ func (cache *cacheStore) cache(key string, p *Page, force, dropCache bool) {
 	if _, ok := cache.pages[key]; ok {
 		return
 	}
+	k := cache.getCacheKey(key)
+	if _, ok := cache.keys[k]; ok {
+		return
+	}
 	p.Acquire()
 	cache.pages[key] = p
 	atomic.AddInt64(&cache.totalPages, int64(cap(p.Data)))

diff --git a/pkg/chunk/mem_cache.go b/pkg/chunk/mem_cache.go
@@ -127,7 +127,7 @@ func (c *memcache) load(key string) (ReadCloser, error) {
 		c.pages[key] = memItem{time.Now(), item.page}
 		return NewPageReader(item.page), nil
 	}
-	return nil, errors.New("not found")
+	return nil, errNotCached
 }
 
 func (c *memcache) exist(key string) (string, bool) {