Skip to content

Commit 996c4be

Browse files
committed
use cache backend to create cache
Signed-off-by: Ben Ye <[email protected]>
1 parent 4621ea4 commit 996c4be

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

pkg/storage/tsdb/caching_bucket.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func CreateCachingBucket(chunksConfig ChunksCacheConfig, metadataConfig Metadata
114114
cfg := cache.NewCachingBucketConfig()
115115
cachingConfigured := false
116116

117-
chunksCache, err := createCache("chunks-cache", chunksConfig.Backend, chunksConfig.Memcached, chunksConfig.Redis, logger, reg)
117+
chunksCache, err := createCache("chunks-cache", &chunksConfig.CacheBackend, logger, reg)
118118
if err != nil {
119119
return nil, errors.Wrapf(err, "chunks-cache")
120120
}
@@ -124,7 +124,7 @@ func CreateCachingBucket(chunksConfig ChunksCacheConfig, metadataConfig Metadata
124124
cfg.CacheGetRange("chunks", chunksCache, isTSDBChunkFile, chunksConfig.SubrangeSize, chunksConfig.AttributesTTL, chunksConfig.SubrangeTTL, chunksConfig.MaxGetRangeRequests)
125125
}
126126

127-
metadataCache, err := createCache("metadata-cache", metadataConfig.Backend, metadataConfig.Memcached, metadataConfig.Redis, logger, reg)
127+
metadataCache, err := createCache("metadata-cache", &metadataConfig.CacheBackend, logger, reg)
128128
if err != nil {
129129
return nil, errors.Wrapf(err, "metadata-cache")
130130
}
@@ -152,29 +152,29 @@ func CreateCachingBucket(chunksConfig ChunksCacheConfig, metadataConfig Metadata
152152
return storecache.NewCachingBucket(bkt, cfg, logger, reg)
153153
}
154154

155-
func createCache(cacheName string, backend string, memcached MemcachedClientConfig, redis RedisClientConfig, logger log.Logger, reg prometheus.Registerer) (cache.Cache, error) {
156-
switch backend {
155+
func createCache(cacheName string, cacheBackend *CacheBackend, logger log.Logger, reg prometheus.Registerer) (cache.Cache, error) {
156+
switch cacheBackend.Backend {
157157
case "":
158158
// No caching.
159159
return nil, nil
160160

161161
case CacheBackendMemcached:
162162
var client cacheutil.MemcachedClient
163-
client, err := cacheutil.NewMemcachedClientWithConfig(logger, cacheName, memcached.ToMemcachedClientConfig(), reg)
163+
client, err := cacheutil.NewMemcachedClientWithConfig(logger, cacheName, cacheBackend.Memcached.ToMemcachedClientConfig(), reg)
164164
if err != nil {
165165
return nil, errors.Wrapf(err, "failed to create memcached client")
166166
}
167167
return cache.NewMemcachedCache(cacheName, logger, client, reg), nil
168168

169169
case CacheBackendRedis:
170-
redisCache, err := cacheutil.NewRedisClientWithConfig(logger, cacheName, redis.ToRedisClientConfig(), reg)
170+
redisCache, err := cacheutil.NewRedisClientWithConfig(logger, cacheName, cacheBackend.Redis.ToRedisClientConfig(), reg)
171171
if err != nil {
172172
return nil, errors.Wrapf(err, "failed to create redis client")
173173
}
174174
return cache.NewRedisCache(cacheName, logger, redisCache, reg), nil
175175

176176
default:
177-
return nil, errors.Errorf("unsupported cache type for cache %s: %s", cacheName, backend)
177+
return nil, errors.Errorf("unsupported cache type for cache %s: %s", cacheName, cacheBackend.Backend)
178178
}
179179
}
180180

0 commit comments

Comments
 (0)