Skip to content

In-Storage & WAL Coupling #4

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
dashpole wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

In-Storage & WAL Coupling #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f1ffa8
tsdb, remote: implement Option A in-storage & WAL exemplar coupling
dashpole Aug 27, 2026
0964887
Address review feedback: WAL replay exemplar recovery, zero-alloc buf…
dashpole Aug 27, 2026
b87ea36
tsdb: update TestWALSampleAndExemplarOrder_AppenderV2 for compound V2…
dashpole Aug 27, 2026
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
241 changes: 241 additions & 0 deletions storage/remote/queue_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,60 @@ outer:
return true
}

func (t *QueueManager) AppendSamplesV2(samples []record.RefSampleV2) bool {
currentTime := time.Now()
outer:
for _, s := range samples {
if isSampleOld(currentTime, time.Duration(t.cfg.SampleAgeLimit), s.T) {
t.metrics.droppedSamplesTotal.WithLabelValues(reasonTooOld).Inc()
continue
}
t.seriesMtx.Lock()
lbls, ok := t.seriesLabels[s.Ref]
if !ok {
t.dataDropped.incr(1)
if _, ok := t.droppedSeries[s.Ref]; !ok {
t.logger.Info("Dropped sample for series that was not explicitly dropped via relabelling", "ref", s.Ref)
t.metrics.droppedSamplesTotal.WithLabelValues(reasonUnintentionalDroppedSeries).Inc()
} else {
t.metrics.droppedSamplesTotal.WithLabelValues(reasonDroppedSeries).Inc()
}
t.seriesMtx.Unlock()
continue
}
meta := t.seriesMetadata[s.Ref]
t.seriesMtx.Unlock()

backoff := model.Duration(5 * time.Millisecond)
for {
select {
case <-t.quit:
return false
default:
}
if t.shards.enqueue(s.Ref, timeSeries{
seriesLabels: lbls,
metadata: meta,
startTimestamp: s.ST,
timestamp: s.T,
value: s.V,
exemplars: s.Exemplars,
sType: tSample,
}) {
continue outer
}

t.metrics.enqueueRetriesTotal.Inc()
time.Sleep(time.Duration(backoff))
backoff *= 2
if backoff > t.cfg.MaxBackoff {
backoff = t.cfg.MaxBackoff
}
}
}
return true
}

func (t *QueueManager) AppendExemplars(exemplars []record.RefExemplar) bool {
if !t.sendExemplars {
return true
Expand Down Expand Up @@ -906,6 +960,69 @@ outer:
return true
}

func (t *QueueManager) AppendHistogramsV2(histograms []record.RefHistogramSampleV2) bool {
if !t.sendNativeHistograms {
return true
}
currentTime := time.Now()
outer:
for _, h := range histograms {
if isSampleOld(currentTime, time.Duration(t.cfg.SampleAgeLimit), h.T) {
t.metrics.droppedHistogramsTotal.WithLabelValues(reasonTooOld).Inc()
continue
}
if t.protoMsg == remoteapi.WriteV1MessageType && h.H != nil && h.H.Schema == histogram.CustomBucketsSchema {
// We cannot send native histograms with custom buckets (NHCB) via remote write v1.
t.metrics.droppedHistogramsTotal.WithLabelValues(reasonNHCBNotSupported).Inc()
t.logger.Warn("Dropped native histogram with custom buckets (NHCB) as remote write v1 does not support itB", "ref", h.Ref)
continue
}
t.seriesMtx.Lock()
lbls, ok := t.seriesLabels[h.Ref]
if !ok {
t.dataDropped.incr(1)
if _, ok := t.droppedSeries[h.Ref]; !ok {
t.logger.Info("Dropped histogram for series that was not explicitly dropped via relabelling", "ref", h.Ref)
t.metrics.droppedHistogramsTotal.WithLabelValues(reasonUnintentionalDroppedSeries).Inc()
} else {
t.metrics.droppedHistogramsTotal.WithLabelValues(reasonDroppedSeries).Inc()
}
t.seriesMtx.Unlock()
continue
}
meta := t.seriesMetadata[h.Ref]
t.seriesMtx.Unlock()

backoff := model.Duration(5 * time.Millisecond)
for {
select {
case <-t.quit:
return false
default:
}
if t.shards.enqueue(h.Ref, timeSeries{
seriesLabels: lbls,
metadata: meta,
startTimestamp: h.ST,
timestamp: h.T,
histogram: h.H,
exemplars: h.Exemplars,
sType: tHistogram,
}) {
continue outer
}

t.metrics.enqueueRetriesTotal.Inc()
time.Sleep(time.Duration(backoff))
backoff *= 2
if backoff > t.cfg.MaxBackoff {
backoff = t.cfg.MaxBackoff
}
}
}
return true
}

func (t *QueueManager) AppendFloatHistograms(floatHistograms []record.RefFloatHistogramSample) bool {
if !t.sendNativeHistograms {
return true
Expand Down Expand Up @@ -968,6 +1085,69 @@ outer:
return true
}

func (t *QueueManager) AppendFloatHistogramsV2(floatHistograms []record.RefFloatHistogramSampleV2) bool {
if !t.sendNativeHistograms {
return true
}
currentTime := time.Now()
outer:
for _, h := range floatHistograms {
if isSampleOld(currentTime, time.Duration(t.cfg.SampleAgeLimit), h.T) {
t.metrics.droppedHistogramsTotal.WithLabelValues(reasonTooOld).Inc()
continue
}
if t.protoMsg == remoteapi.WriteV1MessageType && h.FH != nil && h.FH.Schema == histogram.CustomBucketsSchema {
// We cannot send native histograms with custom buckets (NHCB) via remote write v1.
t.metrics.droppedHistogramsTotal.WithLabelValues(reasonNHCBNotSupported).Inc()
t.logger.Warn("Dropped float native histogram with custom buckets (NHCB) as remote write v1 does not support itB", "ref", h.Ref)
continue
}
t.seriesMtx.Lock()
lbls, ok := t.seriesLabels[h.Ref]
if !ok {
t.dataDropped.incr(1)
if _, ok := t.droppedSeries[h.Ref]; !ok {
t.logger.Info("Dropped histogram for series that was not explicitly dropped via relabelling", "ref", h.Ref)
t.metrics.droppedHistogramsTotal.WithLabelValues(reasonUnintentionalDroppedSeries).Inc()
} else {
t.metrics.droppedHistogramsTotal.WithLabelValues(reasonDroppedSeries).Inc()
}
t.seriesMtx.Unlock()
continue
}
meta := t.seriesMetadata[h.Ref]
t.seriesMtx.Unlock()

backoff := model.Duration(5 * time.Millisecond)
for {
select {
case <-t.quit:
return false
default:
}
if t.shards.enqueue(h.Ref, timeSeries{
seriesLabels: lbls,
metadata: meta,
startTimestamp: h.ST,
timestamp: h.T,
floatHistogram: h.FH,
exemplars: h.Exemplars,
sType: tFloatHistogram,
}) {
continue outer
}

t.metrics.enqueueRetriesTotal.Inc()
time.Sleep(time.Duration(backoff))
backoff *= 2
if backoff > t.cfg.MaxBackoff {
backoff = t.cfg.MaxBackoff
}
}
}
return true
}

// Start the queue manager sending samples to the remote storage.
// Does not block.
func (t *QueueManager) Start() {
Expand Down Expand Up @@ -1410,6 +1590,7 @@ type timeSeries struct {
metadata *metadata.Metadata
startTimestamp, timestamp int64
exemplarLabels labels.Labels
exemplars []record.RefExemplar
// The type of series: sample, exemplar, or histogram.
sType seriesType
}
Expand Down Expand Up @@ -1679,6 +1860,16 @@ func populateTimeSeries(batch []timeSeries, pendingData []prompb.TimeSeries, sen
Timestamp: d.timestamp,
})
nPendingSamples++
if sendExemplars && len(d.exemplars) > 0 {
for _, ex := range d.exemplars {
pendingData[nPending].Exemplars = append(pendingData[nPending].Exemplars, prompb.Exemplar{
Labels: prompb.FromLabels(ex.Labels, nil),
Value: ex.V,
Timestamp: ex.T,
})
nPendingExemplars++
}
}
case tExemplar:
pendingData[nPending].Exemplars = append(pendingData[nPending].Exemplars, prompb.Exemplar{
Labels: prompb.FromLabels(d.exemplarLabels, nil),
Expand All @@ -1689,9 +1880,29 @@ func populateTimeSeries(batch []timeSeries, pendingData []prompb.TimeSeries, sen
case tHistogram:
pendingData[nPending].Histograms = append(pendingData[nPending].Histograms, prompb.FromIntHistogram(d.timestamp, d.histogram))
nPendingHistograms++
if sendExemplars && len(d.exemplars) > 0 {
for _, ex := range d.exemplars {
pendingData[nPending].Exemplars = append(pendingData[nPending].Exemplars, prompb.Exemplar{
Labels: prompb.FromLabels(ex.Labels, nil),
Value: ex.V,
Timestamp: ex.T,
})
nPendingExemplars++
}
}
case tFloatHistogram:
pendingData[nPending].Histograms = append(pendingData[nPending].Histograms, prompb.FromFloatHistogram(d.timestamp, d.floatHistogram))
nPendingHistograms++
if sendExemplars && len(d.exemplars) > 0 {
for _, ex := range d.exemplars {
pendingData[nPending].Exemplars = append(pendingData[nPending].Exemplars, prompb.Exemplar{
Labels: prompb.FromLabels(ex.Labels, nil),
Value: ex.V,
Timestamp: ex.T,
})
nPendingExemplars++
}
}
}
}
return nPendingSamples, nPendingExemplars, nPendingHistograms
Expand Down Expand Up @@ -2017,6 +2228,16 @@ func populateV2TimeSeries(symbolTable *writev2.SymbolsTable, batch []timeSeries,
StartTimestamp: d.startTimestamp,
})
nPendingSamples++
if sendExemplars && len(d.exemplars) > 0 {
for _, ex := range d.exemplars {
pendingData[nPending].Exemplars = append(pendingData[nPending].Exemplars, writev2.Exemplar{
LabelsRefs: symbolTable.SymbolizeLabels(ex.Labels, nil),
Value: ex.V,
Timestamp: ex.T,
})
nPendingExemplars++
}
}
case tExemplar:
pendingData[nPending].Exemplars = append(pendingData[nPending].Exemplars, writev2.Exemplar{
LabelsRefs: symbolTable.SymbolizeLabels(d.exemplarLabels, nil), // TODO: optimize, reuse slice
Expand All @@ -2027,9 +2248,29 @@ func populateV2TimeSeries(symbolTable *writev2.SymbolsTable, batch []timeSeries,
case tHistogram:
pendingData[nPending].Histograms = append(pendingData[nPending].Histograms, writev2.FromIntHistogram(d.startTimestamp, d.timestamp, d.histogram))
nPendingHistograms++
if sendExemplars && len(d.exemplars) > 0 {
for _, ex := range d.exemplars {
pendingData[nPending].Exemplars = append(pendingData[nPending].Exemplars, writev2.Exemplar{
LabelsRefs: symbolTable.SymbolizeLabels(ex.Labels, nil),
Value: ex.V,
Timestamp: ex.T,
})
nPendingExemplars++
}
}
case tFloatHistogram:
pendingData[nPending].Histograms = append(pendingData[nPending].Histograms, writev2.FromFloatHistogram(d.startTimestamp, d.timestamp, d.floatHistogram))
nPendingHistograms++
if sendExemplars && len(d.exemplars) > 0 {
for _, ex := range d.exemplars {
pendingData[nPending].Exemplars = append(pendingData[nPending].Exemplars, writev2.Exemplar{
LabelsRefs: symbolTable.SymbolizeLabels(ex.Labels, nil),
Value: ex.V,
Timestamp: ex.T,
})
nPendingExemplars++
}
}
case tMetadata:
nUnexpectedMetadata++
}
Expand Down
Loading
Loading