RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix infinite loop in index Writer when a series contains duplicated label names 

Signed-off-by: Marco Pracucci <marco@pracucci.com>
This commit is contained in:
Marco Pracucci 2023-07-01 14:29:59 +02:00
parent 031d22df9e
commit 35069910f5
No known key found for this signature in database
GPG Key ID: 74C1BD403D2DF9B5
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tsdb/index/index.go
View File

@ -864,7 +864,10 @@ func (w *Writer) writePostingsToTmpFiles() error {
// using more memory than a single label name can. // using more memory than a single label name can.
for len(names) > 0 { for len(names) > 0 {
if w.labelNames[names[0]]+c > maxPostings { if w.labelNames[names[0]]+c > maxPostings {
break if c > 0 {
break
}
return fmt.Errorf("corruption detected when writing postings to index: label %q has %d uses, but maxPostings is %d", names[0], w.labelNames[names[0]], maxPostings)
} }
batchNames = append(batchNames, names[0]) batchNames = append(batchNames, names[0])
c += w.labelNames[names[0]] c += w.labelNames[names[0]]

15
tsdb/index/index_test.go
View File

@ -471,6 +471,21 @@ func TestPersistence_index_e2e(t *testing.T) {
require.NoError(t, ir.Close()) require.NoError(t, ir.Close())
} }
func TestWriter_ShouldReturnErrorOnSeriesWithDuplicatedLabelNames(t *testing.T) {
w, err := NewWriter(context.Background(), filepath.Join(t.TempDir(), "index"))
require.NoError(t, err)
require.NoError(t, w.AddSymbol("__name__"))
require.NoError(t, w.AddSymbol("metric_1"))
require.NoError(t, w.AddSymbol("metric_2"))
require.NoError(t, w.AddSeries(0, labels.FromStrings("__name__", "metric_1", "__name__", "metric_2")))
err = w.Close()
require.Error(t, err)
require.ErrorContains(t, err, "corruption detected when writing postings to index")
}
func TestDecbufUvarintWithInvalidBuffer(t *testing.T) { func TestDecbufUvarintWithInvalidBuffer(t *testing.T) {
b := realByteSlice([]byte{0x81, 0x81, 0x81, 0x81, 0x81, 0x81}) b := realByteSlice([]byte{0x81, 0x81, 0x81, 0x81, 0x81, 0x81})