Skip to content
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

Jump to bottom

Possibly fixed issue where frigg was picking incorrect blocks to compact #65

Merged
merged 1 commit into from
Feb 27, 2020
Merged

Possibly fixed issue where frigg was picking incorrect blocks to compact #65

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
6 changes: 3 additions & 3 deletions friggdb/compactor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func (rw *readerWriter) blocksToCompact(tenantID string, cursor int) ([]*backend
return nil, cursorDone
}

cursorEnd := cursor + inputBlocks
cursorEnd := cursor + inputBlocks - 1
for {
if cursorEnd >= len(blocklist) {
break
Expand All @@ -122,11 +122,11 @@ func (rw *readerWriter) blocksToCompact(tenantID string, cursor int) ([]*backend
blockEnd := blocklist[cursorEnd]

if blockEnd.EndTime.Sub(blockStart.StartTime) < rw.compactorCfg.MaxCompactionRange {
return blocklist[cursor:cursorEnd], cursorEnd + 1
return blocklist[cursor : cursorEnd+1], cursorEnd + 1
}

cursor++
cursorEnd = cursor + inputBlocks
cursorEnd = cursor + inputBlocks - 1
}

return nil, cursorDone
Expand Down
2 changes: 1 addition & 1 deletion friggdb/friggdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ func (rw *readerWriter) doMaintenance() {

rw.pollBlocklist()

if rw.cfg != nil {
if rw.compactorCfg != nil {
rw.doCompaction()
rw.doRetention()
}
Expand Down