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

head.checkWALExpiry -> head.getWALExpiry; check implies a comparison that doesn't happen in the function

Browse source 
Signed-off-by: Patryk Prus <p@trykpr.us>
This commit is contained in:
Patryk Prus 2025-02-28 12:06:39 -05:00
parent 786d3d99ba
commit f2f1357917
No known key found for this signature in database
GPG key ID: 795650115CA6A58F
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tsdb/head.go
View file

@ -1262,7 +1262,7 @@ func (h *Head) IsQuerierCollidingWithTruncation(querierMint, querierMaxt int64)
return false, false, 0 return false, false, 0
} }
func (h *Head) checkWALExpiry(id chunks.HeadSeriesRef) (int, bool) { func (h *Head) getWALExpiry(id chunks.HeadSeriesRef) (int, bool) {
h.walExpiriesMtx.Lock() h.walExpiriesMtx.Lock()
defer h.walExpiriesMtx.Unlock() defer h.walExpiriesMtx.Unlock()
@ -1286,7 +1286,7 @@ func (h *Head) keepSeriesInWALCheckpoint(id chunks.HeadSeriesRef, last int) bool
} }
// Keep the record if the series has an expiry set. // Keep the record if the series has an expiry set.
keepUntil, ok := h.checkWALExpiry(id) keepUntil, ok := h.getWALExpiry(id)
return ok && keepUntil > last return ok && keepUntil > last
} }

4
tsdb/head_test.go
View file

@ -729,13 +729,13 @@ func TestHead_ReadWAL(t *testing.T) {
// Duplicate series record should not be written to the head. // Duplicate series record should not be written to the head.
require.Nil(t, s101) require.Nil(t, s101)
// But it should have a WAL expiry set. // But it should have a WAL expiry set.
keepUntil, ok := head.checkWALExpiry(101) keepUntil, ok := head.getWALExpiry(101)
require.True(t, ok) require.True(t, ok)
_, last, err := wlog.Segments(w.Dir()) _, last, err := wlog.Segments(w.Dir())
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, last, keepUntil) require.Equal(t, last, keepUntil)
// Only the duplicate series record should have a WAL expiry set. // Only the duplicate series record should have a WAL expiry set.
_, ok = head.checkWALExpiry(50) _, ok = head.getWALExpiry(50)
require.False(t, ok) require.False(t, ok)
expandChunk := func(c chunkenc.Iterator) (x []sample) { expandChunk := func(c chunkenc.Iterator) (x []sample) {