Skip to content

Commit 2e703cf

Browse files
committed
update thanos version to latest main
Signed-off-by: Ben Ye <[email protected]>
1 parent 375e7ea commit 2e703cf

File tree

12 files changed

+78
-119
lines changed

12 files changed

+78
-119
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ require (
5353
github.com/stretchr/testify v1.8.4
5454
github.com/thanos-io/objstore v0.0.0-20231112185854-37752ee64d98
5555
github.com/thanos-io/promql-engine v0.0.0-20231013104847-4517c0d5f591
56-
github.com/thanos-io/thanos v0.32.5-0.20231103115946-463a6ce8b53c
56+
github.com/thanos-io/thanos v0.32.5-0.20231120163350-0a4f5ae3310e
5757
github.com/uber/jaeger-client-go v2.30.0+incompatible
5858
github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d
5959
go.etcd.io/etcd/api/v3 v3.5.10

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1519,8 +1519,8 @@ github.com/thanos-io/objstore v0.0.0-20231112185854-37752ee64d98 h1:gx2MTto1UQRu
15191519
github.com/thanos-io/objstore v0.0.0-20231112185854-37752ee64d98/go.mod h1:JauBAcJ61tRSv9widgISVmA6akQXDeUMXBrVmWW4xog=
15201520
github.com/thanos-io/promql-engine v0.0.0-20231013104847-4517c0d5f591 h1:6bZbFM+Mvy2kL8BeL8TJ5+5pV3sUR2PSLaZyw911rtQ=
15211521
github.com/thanos-io/promql-engine v0.0.0-20231013104847-4517c0d5f591/go.mod h1:vfXJv1JXNdLfHnjsHsLLJl5tyI7KblF76Wo5lZ9YC4Q=
1522-
github.com/thanos-io/thanos v0.32.5-0.20231103115946-463a6ce8b53c h1:hMpXd1ybZB/vnR3+zex93va42rQ++2E0qi2wVSf3AwY=
1523-
github.com/thanos-io/thanos v0.32.5-0.20231103115946-463a6ce8b53c/go.mod h1:q+0MQPBugkBKZBFSOec4WV4EcuKJU6tgMI0i4M2znpY=
1522+
github.com/thanos-io/thanos v0.32.5-0.20231120163350-0a4f5ae3310e h1:ej5fKlojY+r8qty//Q4b7nyNA4QEkJ5uWms77Itf75E=
1523+
github.com/thanos-io/thanos v0.32.5-0.20231120163350-0a4f5ae3310e/go.mod h1:qeDC74QOf5hWzTlvIrLT8WlNGg67nORFON0T2VF4qgg=
15241524
github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab h1:7ZR3hmisBWw77ZpO1/o86g+JV3VKlk3d48jopJxzTjU=
15251525
github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab/go.mod h1:eheTFp954zcWZXCU8d0AT76ftsQOTo4DTqkN/h3k1MY=
15261526
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=

pkg/storage/tsdb/async_op.go

Lines changed: 0 additions & 67 deletions
This file was deleted.

pkg/storage/tsdb/multilevel_cache.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/prometheus/client_golang/prometheus/promauto"
1111
"github.com/prometheus/prometheus/model/labels"
1212
"github.com/prometheus/prometheus/storage"
13+
"github.com/thanos-io/thanos/pkg/cacheutil"
1314
storecache "github.com/thanos-io/thanos/pkg/store/cache"
1415
)
1516

@@ -24,7 +25,7 @@ type multiLevelCache struct {
2425

2526
fetchLatency *prometheus.HistogramVec
2627
backFillLatency *prometheus.HistogramVec
27-
backfillProcessor *AsyncOperationProcessor
28+
backfillProcessor *cacheutil.AsyncOperationProcessor
2829
backfillDroppedItems *prometheus.CounterVec
2930
}
3031

@@ -79,7 +80,7 @@ func (m *multiLevelCache) FetchMultiPostings(ctx context.Context, blockID ulid.U
7980
for lbl, b := range values {
8081
if err := m.backfillProcessor.EnqueueAsync(func() {
8182
m.caches[i].StorePostings(blockID, lbl, b, tenant)
82-
}); errors.Is(err, ErrAsyncBufferFull) {
83+
}); errors.Is(err, cacheutil.ErrAsyncBufferFull) {
8384
m.backfillDroppedItems.WithLabelValues(cacheTypePostings).Inc()
8485
}
8586
}
@@ -116,7 +117,7 @@ func (m *multiLevelCache) FetchExpandedPostings(ctx context.Context, blockID uli
116117
backFillTimer := prometheus.NewTimer(m.backFillLatency.WithLabelValues(cacheTypeExpandedPostings))
117118
if err := m.backfillProcessor.EnqueueAsync(func() {
118119
m.caches[i-1].StoreExpandedPostings(blockID, matchers, d, tenant)
119-
}); errors.Is(err, ErrAsyncBufferFull) {
120+
}); errors.Is(err, cacheutil.ErrAsyncBufferFull) {
120121
m.backfillDroppedItems.WithLabelValues(cacheTypeExpandedPostings).Inc()
121122
}
122123
backFillTimer.ObserveDuration()
@@ -180,7 +181,7 @@ func (m *multiLevelCache) FetchMultiSeries(ctx context.Context, blockID ulid.ULI
180181
for ref, b := range values {
181182
if err := m.backfillProcessor.EnqueueAsync(func() {
182183
m.caches[i].StoreSeries(blockID, ref, b, tenant)
183-
}); errors.Is(err, ErrAsyncBufferFull) {
184+
}); errors.Is(err, cacheutil.ErrAsyncBufferFull) {
184185
m.backfillDroppedItems.WithLabelValues(cacheTypeSeries).Inc()
185186
}
186187
}
@@ -198,7 +199,7 @@ func newMultiLevelCache(reg prometheus.Registerer, cfg MultiLevelIndexCacheConfi
198199

199200
return &multiLevelCache{
200201
caches: c,
201-
backfillProcessor: NewAsyncOperationProcessor(cfg.MaxAsyncBufferSize, cfg.MaxAsyncConcurrency),
202+
backfillProcessor: cacheutil.NewAsyncOperationProcessor(cfg.MaxAsyncBufferSize, cfg.MaxAsyncConcurrency),
202203
fetchLatency: promauto.With(reg).NewHistogramVec(prometheus.HistogramOpts{
203204
Name: "cortex_store_multilevel_index_cache_fetch_duration_seconds",
204205
Help: "Histogram to track latency to fetch items from multi level index cache",

vendor/github.com/thanos-io/thanos/pkg/cacheutil/async_op.go

Lines changed: 15 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/cacheutil/memcached_client.go

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/cacheutil/redis_client.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/compact/downsample/downsample.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/extkingpin/path_content_reloader.go

Lines changed: 15 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)