mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-24 05:04:05 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #13427 from bboreham/skip-empty-merge

Browse source 
storage: skip merging when no remote storage configured
This commit is contained in:
Bryan Boreham 2024-01-22 14:20:13 +00:00 committed by GitHub
parent 65cf528403 63cdd6dbe1
commit 0fe7ba97c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/fanout.go
View file

@ -89,7 +89,9 @@ func (f *fanout) Querier(mint, maxt int64) (Querier, error) {
}
return nil, errs.Err()
}
secondaries = append(secondaries, querier)
if _, ok := querier.(noopQuerier); !ok {
secondaries = append(secondaries, querier)
}
}
return NewMergeQuerier([]Querier{primary}, secondaries, ChainedSeriesMerge), nil
}

3
storage/merge.go
View file

@ -46,6 +46,9 @@ type mergeGenericQuerier struct {
//
// In case of overlaps between the data given by primaries' and secondaries' Selects, merge function will be used.
func NewMergeQuerier(primaries, secondaries []Querier, mergeFn VerticalSeriesMergeFunc) Querier {
if len(primaries)+len(secondaries) == 0 {
return NoopQuerier()
}
queriers := make([]genericQuerier, 0, len(primaries)+len(secondaries))
for _, q := range primaries {
if _, ok := q.(noopQuerier); !ok && q != nil {