mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

tsdb: drop deleted series from the WAL sooner (#12297)

Browse source 
`head.deleted` holds the WAL segment in use at the time each series was
removed from the head. At the end of `truncateWAL()` we will delete
all segments up to `last`, so we can drop any series that were last seen
in a segment at or before that point.

(same change in Prometheus Agent too)

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
This commit is contained in:
Bryan Boreham 2023-05-01 16:43:15 +01:00 committed by GitHub
parent 0d049feac7
commit 0ab9553611
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tsdb/agent/db.go
View file

@ -665,7 +665,7 @@ func (db *DB) truncate(mint int64) error {
} }
seg, ok := db.deleted[id] seg, ok := db.deleted[id]
return ok && seg >= first return ok && seg > last
} }
db.metrics.checkpointCreationTotal.Inc() db.metrics.checkpointCreationTotal.Inc()
@ -687,7 +687,7 @@ func (db *DB) truncate(mint int64) error {
// The checkpoint is written and segments before it are truncated, so we // The checkpoint is written and segments before it are truncated, so we
// no longer need to track deleted series that were being kept around. // no longer need to track deleted series that were being kept around.
for ref, segment := range db.deleted { for ref, segment := range db.deleted {
if segment < first { if segment <= last {
delete(db.deleted, ref) delete(db.deleted, ref)
} }
} }

6
tsdb/head.go
View file

@ -1212,9 +1212,9 @@ func (h *Head) truncateWAL(mint int64) error {
return true return true
} }
h.deletedMtx.Lock() h.deletedMtx.Lock()
_, ok := h.deleted[id] keepUntil, ok := h.deleted[id]
h.deletedMtx.Unlock() h.deletedMtx.Unlock()
return ok return ok && keepUntil > last
} }
h.metrics.checkpointCreationTotal.Inc() h.metrics.checkpointCreationTotal.Inc()
if _, err = wlog.Checkpoint(h.logger, h.wal, first, last, keep, mint); err != nil { if _, err = wlog.Checkpoint(h.logger, h.wal, first, last, keep, mint); err != nil {
@ -1235,7 +1235,7 @@ func (h *Head) truncateWAL(mint int64) error {
// longer need to track deleted series that are before it. // longer need to track deleted series that are before it.
h.deletedMtx.Lock() h.deletedMtx.Lock()
for ref, segment := range h.deleted { for ref, segment := range h.deleted {
if segment < first { if segment <= last {
delete(h.deleted, ref) delete(h.deleted, ref)
} }
} }