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

fix(storage/mergeQuerier): copy the matcjers slice before passing it to queriers as

Browse source 
some of them may alter it.

Signed-off-by: machine424 <ayoubmrini424@gmail.com>
This commit is contained in:
machine424 2024-09-27 16:03:50 +02:00
parent eb523a6b29
commit cebcdce78a
No known key found for this signature in database
GPG key ID: A4B001A4FDEE017D
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
storage/merge.go
View file

@ -155,19 +155,16 @@ func (q *mergeGenericQuerier) Select(ctx context.Context, sortSeries bool, hints
for _, querier := range q.queriers { for _, querier := range q.queriers {
// copy the matchers as some queriers may alter the slice. // copy the matchers as some queriers may alter the slice.
// See https://github.com/prometheus/prometheus/issues/14723 // See https://github.com/prometheus/prometheus/issues/14723
// matchersCopy := make([]*labels.Matcher, len(matchers)) matchersCopy := make([]*labels.Matcher, len(matchers))
// copy(matchersCopy, matchers) copy(matchersCopy, matchers)
wg.Add(1) wg.Add(1)
go func(qr genericQuerier) { go func(qr genericQuerier, m []*labels.Matcher) {
// go func(qr genericQuerier, m []*labels.Matcher) {
defer wg.Done() defer wg.Done()
// We need to sort for NewMergeSeriesSet to work. // We need to sort for NewMergeSeriesSet to work.
// seriesSetChan <- qr.Select(ctx, true, hints, m...) seriesSetChan <- qr.Select(ctx, true, hints, m...)
seriesSetChan <- qr.Select(ctx, true, hints, matchers...) }(querier, matchersCopy)
}(querier)
// }(querier, matchersCopy)
} }
go func() { go func() {
wg.Wait() wg.Wait()

8
tsdb/querier_test.go
View file

@ -3794,6 +3794,9 @@ func (m mockReaderOfLabels) Symbols() index.StringIter {
func TestMergeQuerierConcurrentSelectMatchers(t *testing.T) { func TestMergeQuerierConcurrentSelectMatchers(t *testing.T) {
block, err := OpenBlock(nil, createBlock(t, t.TempDir(), genSeries(1, 1, 0, 1)), nil) block, err := OpenBlock(nil, createBlock(t, t.TempDir(), genSeries(1, 1, 0, 1)), nil)
require.NoError(t, err) require.NoError(t, err)
defer func() {
require.NoError(t, block.Close())
}()
p, err := NewBlockQuerier(block, 0, 1) p, err := NewBlockQuerier(block, 0, 1)
require.NoError(t, err) require.NoError(t, err)
@ -3808,7 +3811,10 @@ func TestMergeQuerierConcurrentSelectMatchers(t *testing.T) {
matchers := append([]*labels.Matcher{}, originalMatchers...) matchers := append([]*labels.Matcher{}, originalMatchers...)
mergedQuerier := storage.NewMergeQuerier([]storage.Querier{p}, []storage.Querier{s}, storage.ChainedSeriesMerge) mergedQuerier := storage.NewMergeQuerier([]storage.Querier{p}, []storage.Querier{s}, storage.ChainedSeriesMerge)
defer mergedQuerier.Close() defer func() {
require.NoError(t, mergedQuerier.Close())
}()
mergedQuerier.Select(context.Background(), false, nil, matchers...) mergedQuerier.Select(context.Background(), false, nil, matchers...)
require.Equal(t, originalMatchers, matchers) require.Equal(t, originalMatchers, matchers)