Skip to content

Catalog v3 #119

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

Draft
wants to merge 2 commits into
base: pp
Choose a base branch
from
Draft

Catalog v3 #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffbe939
catalog v3
Jun 11, 2025
07a7196
test fix
Jun 24, 2025
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
16 changes: 14 additions & 2 deletions cmd/prometheus/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"context"
"errors"
"fmt"
"github.com/prometheus/prometheus/pp/go/relabeler/head/manager"
"math"
"math/bits"
"net"
Expand Down Expand Up @@ -692,7 +693,7 @@ func main() {
os.Exit(1)
}

fileLog, err := catalog.NewFileLogV2(filepath.Join(dataDir, "head.log"))
fileLog, err := catalog.NewFileLogV3(filepath.Join(dataDir, "head.log"))
if err != nil {
level.Error(logger).Log("msg", "failed to create file log", "err", err)
os.Exit(1)
Expand Down Expand Up @@ -1090,7 +1091,18 @@ func main() {
}

multiNotifiable := ready.New().With(receiverReadyNotifier).With(remoteWriterReadyNotifier).Build()
opGC := catalog.NewGC(dataDir, headCatalog, multiNotifiable)
opGC := catalog.NewGC(
clock,
dataDir,
headCatalog,
multiNotifiable,
time.Duration(cfg.tsdb.RetentionDuration),
manager.NewTimeBoundCalculator(
dataDir,
headCatalog,
prometheus.DefaultRegisterer,
),
)

var g run.Group
{
Expand Down
30 changes: 15 additions & 15 deletions pp/go/relabeler/appender/appender_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func (s *AppenderSuite) TestManagerRelabelerKeep() {
}()

headID := "head_id"
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(err)
defer func() { _ = hd.Close() }()

Expand Down Expand Up @@ -264,7 +264,7 @@ func (s *AppenderSuite) TestManagerRelabelerRelabeling() {
}()

headID := "head_id"
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(err)
defer func() { _ = hd.Close() }()
s.T().Log("make appender")
Expand Down Expand Up @@ -419,7 +419,7 @@ func (s *AppenderSuite) TestManagerRelabelerRelabelingAddNewLabel() {
}()

headID := "head_id"
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(err)
defer func() { _ = hd.Close() }()
s.T().Log("make appender")
Expand Down Expand Up @@ -578,7 +578,7 @@ func (s *AppenderSuite) TestManagerRelabelerRelabelingWithExternalLabelsEnd() {
}()

headID := "head_id"
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(err)
defer func() { _ = hd.Close() }()
s.Require().NoError(err)
Expand Down Expand Up @@ -737,7 +737,7 @@ func (s *AppenderSuite) TestManagerRelabelerRelabelingWithExternalLabelsRelabel(
}()

headID := "head_id"
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(err)
defer func() { _ = hd.Close() }()
s.T().Log("make appender")
Expand Down Expand Up @@ -900,7 +900,7 @@ func (s *AppenderSuite) TestManagerRelabelerRelabelingWithTargetLabels() {
}()

headID := "head_id"
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(err)
defer func() { _ = hd.Close() }()
s.T().Log("make appender")
Expand Down Expand Up @@ -1093,7 +1093,7 @@ func (s *AppenderSuite) TestManagerRelabelerRelabelingWithTargetLabels_Conflicti
}()

headID := "head_id"
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(err)
defer func() { _ = hd.Close() }()
s.T().Log("make appender")
Expand Down Expand Up @@ -1287,7 +1287,7 @@ func (s *AppenderSuite) TestManagerRelabelerRelabelingWithTargetLabels_Conflicti
}()

headID := "head_id"
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(err)
defer func() { _ = hd.Close() }()
s.T().Log("make appender")
Expand Down Expand Up @@ -1487,7 +1487,7 @@ func (s *AppenderSuite) TestManagerRelabelerRelabelingWithRotate() {
var generation uint64

headID := "head_id"
hd, err := head.Create(headID, generation, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
hd, err := head.Create(headID, generation, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(err)
headsToClose = append(headsToClose, hd)

Expand All @@ -1510,7 +1510,7 @@ func (s *AppenderSuite) TestManagerRelabelerRelabelingWithRotate() {
inputRelabelerConfigs,
numberOfShards,
0,
head.NoOpLastAppendedSegmentIDSetter{},
head.NoOpNumberOfSegmentsSetter{},
prometheus.DefaultRegisterer,
)
s.Require().NoError(buildErr)
Expand Down Expand Up @@ -1977,7 +1977,7 @@ func (s *AppenderSuite) TestManagerRelabelerKeepWithStaleNans() {
}()

headID := "head_id"
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(err)
defer func() { _ = hd.Close() }()
s.T().Log("make appender")
Expand Down Expand Up @@ -2112,7 +2112,7 @@ func (s *AppenderSuite) TestManagerRelabelerKeepWithStaleNans_WithNullTimestamp(
}()

headID := "head_id"
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(err)
defer func() { _ = hd.Close() }()
s.T().Log("make appender")
Expand Down Expand Up @@ -2244,7 +2244,7 @@ func (s *AppenderSuite) TestManagerRelabelerKeepWithStaleNans_HonorTimestamps()
}()

headID := "head_id"
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
hd, err := head.Create(headID, 0, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(err)
defer func() { _ = hd.Close() }()
s.T().Log("make appender")
Expand Down Expand Up @@ -2403,7 +2403,7 @@ func (s *AppenderSuite) TestManagerRelabelerRelabelingWithRotateWithStaleNans()
var generation uint64

headID := fmt.Sprintf("head_id_%d", generation)
hd, err := head.Create(headID, generation, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
hd, err := head.Create(headID, generation, tmpDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(err)
headsToClose = append(headsToClose, hd)

Expand All @@ -2419,7 +2419,7 @@ func (s *AppenderSuite) TestManagerRelabelerRelabelingWithRotateWithStaleNans()
tmpDirsToRemove = append(tmpDirsToRemove, newDir)
generation++
newHeadID := fmt.Sprintf("head_id_%d", generation)
newHead, buildErr := head.Create(newHeadID, generation, newDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpLastAppendedSegmentIDSetter{}, prometheus.DefaultRegisterer)
newHead, buildErr := head.Create(newHeadID, generation, newDir, inputRelabelerConfigs, numberOfShards, 0, head.NoOpNumberOfSegmentsSetter{}, prometheus.DefaultRegisterer)
s.Require().NoError(buildErr)
headsToClose = append(headsToClose, newHead)
return newHead, nil
Expand Down
79 changes: 68 additions & 11 deletions pp/go/relabeler/head/catalog/catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"errors"
"fmt"
"io"
"math"
"sort"
"sync"

Expand Down Expand Up @@ -41,7 +42,7 @@ type Catalog struct {
log Log
idGenerator IDGenerator
records map[string]*Record
maxLogFileSize int
maxLogFileSize int
corruptedHead prometheus.Counter
activeHeadCreatedAt prometheus.Gauge
}
Expand Down Expand Up @@ -112,6 +113,8 @@ func (c *Catalog) Create(numberOfShards uint16) (r *Record, err error) {
updatedAt: now,
deletedAt: 0,
referenceCount: 0,
mint: math.MaxInt64,
maxt: math.MaxInt64,
status: StatusNew,
}

Expand Down Expand Up @@ -143,35 +146,89 @@ func (c *Catalog) SetStatus(id string, status Status) (_ *Record, err error) {
return nil, fmt.Errorf("compact: %w", err)
}

r, ok := c.records[id]
record, ok := c.records[id]
if !ok {
return nil, fmt.Errorf("not found: %s", id)
}

return c.setStatus(record, status, record.mint, record.maxt)
}

func (c *Catalog) SetStatusWithTimeBounds(id string, status Status, mint, maxt int64) (record *Record, err error) {
c.mtx.Lock()
defer c.mtx.Unlock()

if err = c.compactIfNeeded(); err != nil {
return nil, fmt.Errorf("compact: %w", err)
}

record, ok := c.records[id]
if !ok {
return nil, fmt.Errorf("not found: %s", id)
}

if r.status == status {
return c.setStatus(record, status, mint, maxt)
}

func (c *Catalog) setStatus(record *Record, status Status, mint, maxt int64) (_ *Record, err error) {
if record.status == status && record.mint == mint && record.maxt == maxt {
if status == StatusActive {
c.activeHeadCreatedAt.Set(float64(r.createdAt))
c.activeHeadCreatedAt.Set(float64(record.createdAt))
}

return r, nil
return record, nil
}

changed := createRecordCopy(r)
changed := createRecordCopy(record)
changed.status = status
changed.mint = mint
changed.maxt = maxt
changed.updatedAt = c.clock.Now().UnixMilli()

if err = c.log.Write(changed); err != nil {
return r, fmt.Errorf("log write: %w", err)
return record, fmt.Errorf("log write: %w", err)
}

applyRecordChanges(r, changed)
c.records[id] = r
applyRecordChanges(record, changed)
c.records[record.id.String()] = record

if status == StatusActive {
c.activeHeadCreatedAt.Set(float64(r.createdAt))
c.activeHeadCreatedAt.Set(float64(record.createdAt))
}

return r, nil
return record, nil
}

func (c *Catalog) SetTimeBounds(id string, mint, maxt int64) (_ *Record, err error) {
c.mtx.Lock()
defer c.mtx.Unlock()

if err = c.compactIfNeeded(); err != nil {
return nil, fmt.Errorf("compact: %w", err)
}

record, ok := c.records[id]
if !ok {
return nil, fmt.Errorf("not found: %s", id)
}

if record.mint == mint && record.maxt == maxt {
return record, nil
}

changed := createRecordCopy(record)
changed.mint = mint
changed.maxt = maxt
changed.updatedAt = c.clock.Now().UnixMilli()

if err = c.log.Write(changed); err != nil {
return record, fmt.Errorf("log write: %w", err)
}

applyRecordChanges(record, changed)
c.records[record.id.String()] = record

return record, nil
}

func (c *Catalog) SetCorrupted(id string) (_ *Record, err error) {
Expand Down
Loading
Loading