warmup: evict sub command may remove stage incorrectly

pkg/chunk/cached_store.go

@@ -1115,7 +1115,7 @@ func (store *cachedStore) EvictCache(id uint64, length uint32) error {
 	r := sliceForRead(id, int(length), store)
 	keys := r.keys()
 	for _, k := range keys {
-		store.bcache.remove(k)
+		store.bcache.removeReadCache(k)
 	}
 	return nil
 }

pkg/chunk/disk_cache.go

@@ -561,6 +561,38 @@ func (cache *cacheStore) remove(key string) {
 		return
 	}
 
+	path := cache.doRemove(key)
+	if path != "" {
+		if err := cache.removeFile(path); err != nil && !os.IsNotExist(err) {
+			logger.Warnf("remove %s failed: %s", path, err)
+		}
+		if err := cache.removeStage(key); err != nil && !os.IsNotExist(err) {
+			logger.Warnf("remove stage %s failed: %s", cache.stagePath(key), err)
+		}
+	}
+}
+
+func (cache *cacheStore) removeReadCache(key string) {
+	cache.state.beforeCacheOp()
+	defer cache.state.afterCacheOp()
+	if cache.state.checkCacheOp() != nil {
+		return
+	}
+
+	// skip stage
+	if utils.Exists(cache.stagePath(key)) {
+		return
+	}
+
+	path := cache.doRemove(key)
+	if path != "" {
+		if err := cache.removeFile(path); err != nil && !os.IsNotExist(err) {
+			logger.Warnf("remove %s failed: %s", path, err)
+		}
+	}
+}
+
+func (cache *cacheStore) doRemove(key string) string {
 	cache.Lock()
 	delete(cache.pages, key)
 	path := cache.cachePath(key)
@@ -574,14 +606,7 @@ func (cache *cacheStore) remove(key string) {
 		path = "" // not existed
 	}
 	cache.Unlock()
-	if path != "" {
-		if err := cache.removeFile(path); err != nil && !os.IsNotExist(err) {
-			logger.Warnf("remove %s failed: %s", path, err)
-		}
-		if err := cache.removeStage(key); err != nil && !os.IsNotExist(err) {
-			logger.Warnf("remove %s failed: %s", cache.stagePath(key), err)
-		}
-	}
+	return path
 }
 
 func (cache *cacheStore) load(key string) (ReadCloser, error) {
@@ -1005,6 +1030,7 @@ func expandDir(pattern string) []string {
 type CacheManager interface {
 	cache(key string, p *Page, force, dropCache bool)
 	remove(key string)
+	removeReadCache(key string) // remove read cache only
 	load(key string) (ReadCloser, error)
 	uploaded(key string, size int)
 	stage(key string, data []byte, keepCache bool) (string, error)
@@ -1192,6 +1218,13 @@ func (m *cacheManager) remove(key string) {
 	}
 }
 
+func (m *cacheManager) removeReadCache(key string) {
+	store := m.getStore(key)
+	if store != nil {
+		store.removeReadCache(key)
+	}
+}
+
 func (m *cacheManager) stage(key string, data []byte, keepCache bool) (string, error) {
 	store := m.getStore(key)
 	if store != nil {

pkg/chunk/mem_cache.go

@@ -111,6 +111,10 @@ func (c *memcache) remove(key string) {
 	}
 }
 
+func (c *memcache) removeReadCache(key string) {
+	c.remove(key)
+}
+
 func (c *memcache) load(key string) (ReadCloser, error) {
 	c.Lock()
 	defer c.Unlock()