feat: compactor rewriter LRU cache (#3165)

grafana · Apr 8, 2024 · f63de9b · f63de9b
1 parent 94564fa
commit f63de9b
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 227 deletions.
diff --git a/cmd/profilecli/compact.go b/cmd/profilecli/compact.go
@@ -86,10 +86,7 @@ func compact(ctx context.Context, src, dst string, metas []*block.Meta, shards i
 	for _, b := range blocks {
 		b := b
 		g.Go(func() error {
-			if err := b.Open(groupCtx); err != nil {
-				return err
-			}
-			return b.Symbols().Load(groupCtx)
+			return b.Open(groupCtx)
 		})
 	}
 	if err := g.Wait(); err != nil {

diff --git a/go.mod b/go.mod
@@ -36,6 +36,7 @@ require (
 	github.com/grafana/river v0.3.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0
+	github.com/hashicorp/golang-lru/v2 v2.0.5
 	github.com/json-iterator/go v1.1.12
 	github.com/k0kubun/pp/v3 v3.2.0
 	github.com/klauspost/compress v1.17.4

diff --git a/go.sum b/go.sum
@@ -453,6 +453,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4=
 github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hashicorp/golang-lru/v2 v2.0.5 h1:wW7h1TG88eUIJ2i69gaE3uNVtEPIagzhGvHgwfx2Vm4=
+github.com/hashicorp/golang-lru/v2 v2.0.5/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
 github.com/hashicorp/nomad/api v0.0.0-20230721134942-515895c7690c h1:Nc3Mt2BAnq0/VoLEntF/nipX+K1S7pG+RgwiitSv6v0=

diff --git a/pkg/compactor/bucket_compactor.go b/pkg/compactor/bucket_compactor.go
@@ -366,12 +366,6 @@ func (c *BlockCompactor) CompactWithSplitting(ctx context.Context, dest string,
 			if err := b.Open(ctx); err != nil {
 				return errors.Wrapf(err, "open block %s", meta.ULID)
 			}
-			// Only load symbols if we are splitting.
-			if shardCount > 1 {
-				if err = b.Symbols().Load(ctx); err != nil {
-					return errors.Wrapf(err, "error loading symbols")
-				}
-			}
 			readers[idx] = b
 			return nil
 		})

diff --git a/pkg/phlaredb/block_querier_symbols.go b/pkg/phlaredb/block_querier_symbols.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/grafana/dskit/multierror"
 	"github.com/grafana/dskit/runutil"
-	"github.com/opentracing/opentracing-go"
 	"github.com/parquet-go/parquet-go"
 	"golang.org/x/sync/errgroup"
 
@@ -28,7 +27,6 @@ import (
 type symbolsResolver interface {
 	symdb.SymbolsReader
 	io.Closer
-	Load(context.Context) error
 }
 
 type symbolsResolverV1 struct {
@@ -54,11 +52,6 @@ func newSymbolsResolverV1(ctx context.Context, bucketReader phlareobj.Bucket, me
 	return r, err
 }
 
-func (r *symbolsResolverV1) Load(_ context.Context) error {
-	// Unsupported.
-	return nil
-}
-
 func (r *symbolsResolverV1) Close() error {
 	return multierror.New(
 		r.stacktraces.Close(),
@@ -141,12 +134,6 @@ func newSymbolsResolverV2(ctx context.Context, b phlareobj.Bucket, meta *block.M
 	return &r, err
 }
 
-func (r *symbolsResolverV2) Load(ctx context.Context) error {
-	sp, ctx := opentracing.StartSpanFromContext(ctx, "symbols.Load")
-	defer sp.Finish()
-	return r.symbols.Load(ctx)
-}
-
 func (r *symbolsResolverV2) Close() error {
 	err := multierror.New()
 	if r.symbols != nil {

diff --git a/pkg/phlaredb/compact_test.go b/pkg/phlaredb/compact_test.go
@@ -679,7 +679,6 @@ func newBlock(t testing.TB, generator func() []*testhelper.ProfileBuilder) *sing
 	}
 	blk := NewSingleBlockQuerierFromMeta(ctx, bkt, meta)
 	require.NoError(t, blk.Open(ctx))
-	require.NoError(t, blk.symbols.Load(ctx))
 	return blk
 }
 
@@ -903,7 +902,6 @@ func Benchmark_CompactSplit(b *testing.B) {
 	require.NoError(b, err)
 	bl := NewSingleBlockQuerierFromMeta(ctx, bkt, meta)
 	require.NoError(b, bl.Open(ctx))
-	require.NoError(b, bl.Symbols().Load(ctx))
 	dst := b.TempDir()
 
 	b.ResetTimer()

diff --git a/pkg/phlaredb/symdb/block_reader.go b/pkg/phlaredb/symdb/block_reader.go
@@ -35,10 +35,6 @@ type Reader struct {
 	partitions    []*partition
 	partitionsMap map[uint64]*partition
 
-	// Indicates whether the block reader was loaded.
-	// Loaded partitions are not released.
-	loaded bool
-
 	locations parquetobj.File
 	mappings  parquetobj.File
 	functions parquetobj.File
@@ -196,10 +192,8 @@ func (r *Reader) partition(ctx context.Context, partition uint64) (*partition, e
 	if !ok {
 		return nil, ErrPartitionNotFound
 	}
-	if !r.loaded {
-		if err := p.init(ctx); err != nil {
-			return nil, err
-		}
+	if err := p.init(ctx); err != nil {
+		return nil, err
 	}
 	return p, nil
 }
@@ -219,9 +213,7 @@ func (p *partition) init(ctx context.Context) (err error) {
 }
 
 func (p *partition) Release() {
-	if !p.reader.loaded {
-		p.tx().release()
-	}
+	p.tx().release()
 }
 
 func (p *partition) tx() *fetchTx {

diff --git a/pkg/phlaredb/symdb/block_reader_load.go b/pkg/phlaredb/symdb/block_reader_load.go
diff --git a/pkg/phlaredb/symdb/block_reader_load_test.go b/pkg/phlaredb/symdb/block_reader_load_test.go
diff --git a/pkg/phlaredb/symdb/resolver_test.go b/pkg/phlaredb/symdb/resolver_test.go
@@ -86,11 +86,6 @@ func (m *mockSymbolsReader) Partition(ctx context.Context, partition uint64) (Pa
 	return r, args.Error(1)
 }
 
-func (m *mockSymbolsReader) Load(ctx context.Context) error {
-	args := m.Called(ctx)
-	return args.Error(0)
-}
-
 type fakeContext struct {
 	context.Context
 	once sync.Once