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

reduce allocs in delete requests manager by reusing slice for tracing non-deleted intervals for chunks #3769

Merged
merged 1 commit into from
May 27, 2021
Merged

reduce allocs in delete requests manager by reusing slice for tracing non-deleted intervals for chunks #3769

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
30 changes: 18 additions & 12 deletions pkg/storage/stores/shipper/compactor/deletion/delete_requests_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ type DeleteRequestsManager struct {
deleteRequestsStore DeleteRequestsStore
deleteRequestCancelPeriod time.Duration

deleteRequestsToProcess []DeleteRequest
deleteRequestsToProcess []DeleteRequest
chunkIntervalsToRetain []model.Interval
// WARN: If by any chance we change deleteRequestsToProcessMtx to sync.RWMutex to be able to check multiple chunks at a time,
// please take care of chunkIntervalsToRetain which should be unique per chunk.
deleteRequestsToProcessMtx sync.Mutex
metrics *deleteRequestsManagerMetrics
wg sync.WaitGroup
Expand Down Expand Up @@ -125,16 +128,19 @@ func (d *DeleteRequestsManager) Expired(ref retention.ChunkEntry, _ model.Time)
d.deleteRequestsToProcessMtx.Lock()
defer d.deleteRequestsToProcessMtx.Unlock()

intervalsToRetain := []model.Interval{
{
Start: ref.From,
End: ref.Through,
},
if len(d.deleteRequestsToProcess) == 0 {
return false, nil
}

d.chunkIntervalsToRetain = d.chunkIntervalsToRetain[:0]
d.chunkIntervalsToRetain = append(d.chunkIntervalsToRetain, model.Interval{
Start: ref.From,
End: ref.Through,
})

for _, deleteRequest := range d.deleteRequestsToProcess {
rebuiltIntervals := make([]model.Interval, 0, len(intervalsToRetain))
for _, interval := range intervalsToRetain {
rebuiltIntervals := make([]model.Interval, 0, len(d.chunkIntervalsToRetain))
for _, interval := range d.chunkIntervalsToRetain {
entry := ref
entry.From = interval.Start
entry.Through = interval.End
Expand All @@ -146,19 +152,19 @@ func (d *DeleteRequestsManager) Expired(ref retention.ChunkEntry, _ model.Time)
}
}

intervalsToRetain = rebuiltIntervals
if len(intervalsToRetain) == 0 {
d.chunkIntervalsToRetain = rebuiltIntervals
if len(d.chunkIntervalsToRetain) == 0 {
d.metrics.deleteRequestsChunksSelectedTotal.WithLabelValues(string(ref.UserID)).Inc()
return true, nil
}
}

if len(intervalsToRetain) == 1 && intervalsToRetain[0].Start == ref.From && intervalsToRetain[0].End == ref.Through {
if len(d.chunkIntervalsToRetain) == 1 && d.chunkIntervalsToRetain[0].Start == ref.From && d.chunkIntervalsToRetain[0].End == ref.Through {
return false, nil
}

d.metrics.deleteRequestsChunksSelectedTotal.WithLabelValues(string(ref.UserID)).Inc()
return true, intervalsToRetain
return true, d.chunkIntervalsToRetain
}

func (d *DeleteRequestsManager) MarkPhaseStarted() {
Expand Down