Skip to content

Commit 4cfaf21

Browse files
committed
fix(blooms): Fix strategy logger and add task test
1 parent 4bfa380 commit 4cfaf21

File tree

3 files changed

+52
-2
lines changed

3 files changed

+52
-2
lines changed

pkg/bloombuild/planner/strategies/chunksize.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (s *ChunkSizeStrategy) Plan(
5454
targetTaskSize := s.limits.BloomTaskTargetSeriesChunksSizeBytes(tenant)
5555

5656
logger := log.With(s.logger, "table", table.Addr(), "tenant", tenant)
57-
level.Debug(s.logger).Log("msg", "loading work for tenant", "target task size", humanize.Bytes(targetTaskSize))
57+
level.Debug(logger).Log("msg", "loading work for tenant", "target task size", humanize.Bytes(targetTaskSize))
5858

5959
// Determine which TSDBs have gaps and need to be processed.
6060
tsdbsWithGaps, err := gapsBetweenTSDBsAndMetas(v1.NewBounds(0, math.MaxUint64), tsdbs, metas)

pkg/bloombuild/planner/strategies/splitkeyspace.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func (s *SplitKeyspaceStrategy) Plan(
5050
ownershipRanges := SplitFingerprintKeyspaceByFactor(splitFactor)
5151

5252
logger := log.With(s.logger, "table", table.Addr(), "tenant", tenant)
53-
level.Debug(s.logger).Log("msg", "loading work for tenant", "splitFactor", splitFactor)
53+
level.Debug(logger).Log("msg", "loading work for tenant", "splitFactor", splitFactor)
5454

5555
var tasks []*protos.Task
5656
for _, ownershipRange := range ownershipRanges {

pkg/bloombuild/protos/compat_test.go

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package protos
2+
3+
import (
4+
"testing"
5+
6+
"github.com/stretchr/testify/require"
7+
8+
"github.com/grafana/loki/v3/pkg/bloombuild/planner/plannertest"
9+
v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1"
10+
"github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper"
11+
"github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb"
12+
)
13+
14+
func TestTaskToProtoTask(t *testing.T) {
15+
// Hack to set exportTSInSecs to true
16+
idx := plannertest.TsdbID(1234)
17+
idx, _ = tsdb.ParseSingleTenantTSDBPath(idx.Name())
18+
19+
in := NewTask(plannertest.TestTable, "fake", v1.NewBounds(0, 100), idx, []Gap{
20+
{
21+
Bounds: v1.NewBounds(0, 25),
22+
Series: plannertest.GenSeriesWithStep(v1.NewBounds(0, 10), 2),
23+
Blocks: []bloomshipper.BlockRef{
24+
plannertest.GenBlockRef(0, 2),
25+
plannertest.GenBlockRef(4, 10),
26+
},
27+
},
28+
{
29+
Bounds: v1.NewBounds(30, 50),
30+
Series: plannertest.GenSeriesWithStep(v1.NewBounds(30, 40), 2),
31+
Blocks: []bloomshipper.BlockRef{
32+
plannertest.GenBlockRef(30, 50),
33+
},
34+
},
35+
{
36+
Bounds: v1.NewBounds(60, 100),
37+
Series: plannertest.GenSeriesWithStep(v1.NewBounds(60, 70), 5),
38+
Blocks: []bloomshipper.BlockRef{
39+
plannertest.GenBlockRef(60, 70),
40+
plannertest.GenBlockRef(71, 90),
41+
plannertest.GenBlockRef(91, 100),
42+
},
43+
},
44+
})
45+
46+
out, err := FromProtoTask(in.ToProtoTask())
47+
require.NoError(t, err)
48+
49+
require.Equal(t, in, out)
50+
}

0 commit comments

Comments
 (0)