From f4a38f7fb14c7cf2616e75d2283404f0be5348f6 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Wed, 21 Aug 2019 17:11:05 +0300 Subject: [PATCH] app/vmselect/promql: fix panic on `-search.disableCache` Reset the cache if it is disabled instead of stopping, since it is stopped on graceful shutdown. --- app/vmselect/promql/rollup_result_cache.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/vmselect/promql/rollup_result_cache.go b/app/vmselect/promql/rollup_result_cache.go index 472004f34..49f8c7d7a 100644 --- a/app/vmselect/promql/rollup_result_cache.go +++ b/app/vmselect/promql/rollup_result_cache.go @@ -53,8 +53,7 @@ func InitRollupResultCache(cachePath string) { c = workingsetcache.New(cacheSize, time.Hour) } if *disableCache { - c.Stop() - c = nil + c.Reset() } stats := &fastcache.Stats{} @@ -99,10 +98,8 @@ func InitRollupResultCache(cachePath string) { // StopRollupResultCache closes the rollupResult cache. func StopRollupResultCache() { if len(rollupResultCachePath) == 0 { - if !*disableCache { - rollupResultCacheV.c.Stop() - rollupResultCacheV.c = nil - } + rollupResultCacheV.c.Stop() + rollupResultCacheV.c = nil return } logger.Infof("saving rollupResult cache to %q...", rollupResultCachePath)