Skip to content

Add graceful period for compaction groups #7182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexqyle wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −2
Open

Add graceful period for compaction groups #7182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/compactor/partition_compaction_grouper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,9 @@ func (g *PartitionCompactionGrouper) groupBlocksByRange(blocks []*metadata.Meta,
}

if len(group.blocks) > 1 {
ret = append(ret, group)
if time.UnixMilli(group.rangeEnd).Before(time.Now().Add(-2 * g.compactorCfg.CleanupInterval)) {
ret = append(ret, group)
}
}
}

Expand Down
43 changes: 42 additions & 1 deletion pkg/compactor/partition_compaction_grouper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2036,12 +2036,48 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) {
{blocks: []ulid.ULID{block1, block2}, partitionCount: 1, partitionID: 0, rangeStart: 0 * H, rangeEnd: 12 * H},
},
},
"group end time is too close to now time": {
ranges: []time.Duration{2 * time.Hour, 12 * time.Hour, 24 * time.Hour},
blocks: map[ulid.ULID]mockBlock{
block1: {
meta: &metadata.Meta{
BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: getRangeStartBasedOnNow(2*time.Hour) - 2*time.Hour.Milliseconds(), MaxTime: getRangeStartBasedOnNow(2 * time.Hour), Compaction: tsdb.BlockMetaCompaction{Level: 1}},
},
timeRange: 2 * time.Hour,
hasNoCompactMark: false,
},
block2: {
meta: &metadata.Meta{
BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: getRangeStartBasedOnNow(2*time.Hour) - 2*time.Hour.Milliseconds(), MaxTime: getRangeStartBasedOnNow(2 * time.Hour), Compaction: tsdb.BlockMetaCompaction{Level: 1}},
},
timeRange: 2 * time.Hour,
hasNoCompactMark: false,
},
block3: {
meta: &metadata.Meta{
BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: getRangeStartBasedOnNow(2*time.Hour) - 2*time.Hour.Milliseconds(), MaxTime: getRangeStartBasedOnNow(2 * time.Hour), Compaction: tsdb.BlockMetaCompaction{Level: 1}},
},
timeRange: 2 * time.Hour,
hasNoCompactMark: false,
},
block4: {
meta: &metadata.Meta{
BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: getRangeStartBasedOnNow(2*time.Hour) - 2*time.Hour.Milliseconds(), MaxTime: getRangeStartBasedOnNow(2 * time.Hour), Compaction: tsdb.BlockMetaCompaction{Level: 1}},
},
timeRange: 2 * time.Hour,
hasNoCompactMark: false,
},
},
existingPartitionedGroups: []mockExistingPartitionedGroup{},
expected: []expectedCompactionJob{},
},
}

for testName, testCase := range tests {
t.Run(testName, func(t *testing.T) {
compactorCfg := &Config{
BlockRanges: testCase.ranges,
BlockRanges: testCase.ranges,
CleanupInterval: time.Hour,
}

limits := &validation.Limits{
Expand Down Expand Up @@ -2125,6 +2161,11 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) {
}
}

func getRangeStartBasedOnNow(r time.Duration) int64 {
tr := r.Milliseconds()
return tr * (time.Now().UnixMilli() / tr)
}

type generateCompactionJobsTestCase struct {
ranges []time.Duration
blocks map[ulid.ULID]mockBlock
Expand Down
Loading