From 31378b234fc1ae645e2e865fb34cd50362bc57a4 Mon Sep 17 00:00:00 2001 From: Jonathan Halterman Date: Wed, 13 Nov 2024 13:48:59 -0800 Subject: [PATCH 1/3] Log fetched bucket index timestamps Adds logging of bucket index timestamps after they're fetched, in queriers and store gateways. --- pkg/querier/blocks_finder_bucket_index.go | 2 ++ pkg/storage/tsdb/bucketindex/loader.go | 2 +- pkg/storegateway/bucket_index_metadata_fetcher.go | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/querier/blocks_finder_bucket_index.go b/pkg/querier/blocks_finder_bucket_index.go index ee6b187a555..bdaa5b92708 100644 --- a/pkg/querier/blocks_finder_bucket_index.go +++ b/pkg/querier/blocks_finder_bucket_index.go @@ -40,6 +40,7 @@ type BucketIndexBlocksFinder struct { cfg BucketIndexBlocksFinderConfig loader *bucketindex.Loader + logger log.Logger } func NewBucketIndexBlocksFinder(cfg BucketIndexBlocksFinderConfig, bkt objstore.Bucket, cfgProvider bucket.TenantConfigProvider, logger log.Logger, reg prometheus.Registerer) *BucketIndexBlocksFinder { @@ -49,6 +50,7 @@ func NewBucketIndexBlocksFinder(cfg BucketIndexBlocksFinderConfig, bkt objstore. cfg: cfg, loader: loader, Service: loader, + logger: logger, } } diff --git a/pkg/storage/tsdb/bucketindex/loader.go b/pkg/storage/tsdb/bucketindex/loader.go index 4b1192ab22a..225b69a037f 100644 --- a/pkg/storage/tsdb/bucketindex/loader.go +++ b/pkg/storage/tsdb/bucketindex/loader.go @@ -133,7 +133,7 @@ func (l *Loader) GetIndex(ctx context.Context, userID string) (*Index, error) { elapsedTime := time.Since(startTime) l.loadDuration.Observe(elapsedTime.Seconds()) - level.Info(l.logger).Log("msg", "loaded bucket index", "user", userID, "duration", elapsedTime) + level.Info(l.logger).Log("msg", "loaded bucket index", "user", userID, "updatedAt", idx.UpdatedAt, "duration", elapsedTime) return idx, nil } diff --git a/pkg/storegateway/bucket_index_metadata_fetcher.go b/pkg/storegateway/bucket_index_metadata_fetcher.go index d7885340069..98db5747e10 100644 --- a/pkg/storegateway/bucket_index_metadata_fetcher.go +++ b/pkg/storegateway/bucket_index_metadata_fetcher.go @@ -94,6 +94,8 @@ func (f *BucketIndexMetadataFetcher) Fetch(ctx context.Context) (metas map[ulid. return nil, nil, errors.Wrapf(err, "read bucket index") } + level.Info(f.logger).Log("msg", "fetched bucket index", "userID", f.userID, "updatedAt", idx.UpdatedAt) + // Build block metas out of the index. metas = make(map[ulid.ULID]*block.Meta, len(idx.Blocks)) for _, b := range idx.Blocks { From d3a6c92d71cf6dd835ed1d5f30611f4b96901236 Mon Sep 17 00:00:00 2001 From: Jonathan Halterman Date: Wed, 13 Nov 2024 14:23:18 -0800 Subject: [PATCH 2/3] Use similar naming for both log entries --- pkg/storegateway/bucket_index_metadata_fetcher.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/storegateway/bucket_index_metadata_fetcher.go b/pkg/storegateway/bucket_index_metadata_fetcher.go index 98db5747e10..fc92b000c2e 100644 --- a/pkg/storegateway/bucket_index_metadata_fetcher.go +++ b/pkg/storegateway/bucket_index_metadata_fetcher.go @@ -94,7 +94,7 @@ func (f *BucketIndexMetadataFetcher) Fetch(ctx context.Context) (metas map[ulid. return nil, nil, errors.Wrapf(err, "read bucket index") } - level.Info(f.logger).Log("msg", "fetched bucket index", "userID", f.userID, "updatedAt", idx.UpdatedAt) + level.Info(f.logger).Log("msg", "loaded bucket index", "user", f.userID, "updatedAt", idx.UpdatedAt) // Build block metas out of the index. metas = make(map[ulid.ULID]*block.Meta, len(idx.Blocks)) From b02409ff40748efa8f9dbdb788840e2f2275e614 Mon Sep 17 00:00:00 2001 From: Jonathan Halterman Date: Wed, 13 Nov 2024 14:53:10 -0800 Subject: [PATCH 3/3] Fix test --- pkg/storegateway/bucket_index_metadata_fetcher_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/storegateway/bucket_index_metadata_fetcher_test.go b/pkg/storegateway/bucket_index_metadata_fetcher_test.go index ba801afa980..d0e63489748 100644 --- a/pkg/storegateway/bucket_index_metadata_fetcher_test.go +++ b/pkg/storegateway/bucket_index_metadata_fetcher_test.go @@ -68,7 +68,6 @@ func TestBucketIndexMetadataFetcher_Fetch(t *testing.T) { block3.ID: block3.ThanosMeta(), }, metas) assert.Empty(t, partials) - assert.Empty(t, logs) assert.NoError(t, testutil.GatherAndCompare(reg, bytes.NewBufferString(` # HELP blocks_meta_sync_failures_total Total blocks metadata synchronization failures