Exclude blocks in last active window from compaction

tempodb/compaction_block_selector.go

@@ -76,6 +76,20 @@ func newTimeWindowBlockSelector(blocklist []*encoding.BlockMeta, maxCompactionRa
  MaxCompactionObjects: maxCompactionObjects,
  }
 
+ activeWindow := twbs.windowForTime(time.Now().Add(-activeWindowDuration))
+
+ // exclude blocks that fall in last window from active -> inactive cut-over
+ // blocks in this window will not be compacted in order to avoid
+ // ownership conflicts where two compactors process the same block
+ // at the same time as it transitions from last active window to first inactive window.
+ var newBlocks []*encoding.BlockMeta
+ for _, b := range twbs.blocklist {
+ if twbs.windowForBlock(b) != activeWindow {
+ newBlocks = append(newBlocks, b)
+ }
+ }
+ twbs.blocklist = newBlocks
+
  // sort by compaction window, level, and then size
  sort.Slice(twbs.blocklist, func(i, j int) bool {
  bi := twbs.blocklist[i]
@@ -84,7 +98,6 @@ func newTimeWindowBlockSelector(blocklist []*encoding.BlockMeta, maxCompactionRa
  wi := twbs.windowForBlock(bi)
  wj := twbs.windowForBlock(bj)
 
- activeWindow := twbs.windowForTime(time.Now().Add(-activeWindowDuration))
  if activeWindow <= wi && activeWindow <= wj {
  // inside active window. sort by: compaction lvl -> window -> size
  // we should always choose the smallest two blocks whos compaction lvl and windows match

tempodb/compaction_block_selector_test.go

@@ -539,6 +539,21 @@ func TestTimeWindowBlockSelectorBlocksToCompact(t *testing.T) {
  expectedSecond: nil,
  expectedHash2: "",
  },
+ {
+ name: "doesn't select blocks in last active window",
+ blocklist: []*encoding.BlockMeta{
+ {
+ BlockID: uuid.MustParse("00000000-0000-0000-0000-000000000001"),
+ EndTime: now.Add(-activeWindowDuration),
+ CompactionLevel: 0,
+ },
+ {
+ BlockID: uuid.MustParse("00000000-0000-0000-0000-000000000002"),
+ EndTime: now.Add(-activeWindowDuration),
+ CompactionLevel: 0,
+ },
+ },
+ },
  }
 
  for _, tt := range tests {
@@ -569,7 +584,7 @@ func TestTimeWindowBlockSelectorBlocksToCompact(t *testing.T) {
 
 func TestTimeWindowBlockSelectorSort(t *testing.T) {
  now := time.Now()
- timeWindow := 12 * time.Hour
+ timeWindow := time.Hour
 
  tests := []struct {
  name string