upstream/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-02-18 18:25:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Refactor storage package errors (#17846)

Browse source 
Replace use of `tsdb/errors` with standard library `errors`.

Signed-off-by: SuperQ <superq@gmail.com>
This commit is contained in:
Ben Kochie 2026-01-13 10:21:33 +01:00 committed by GitHub
parent 03a1d7a350
commit 836caf7b16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
storage/fanout.go
View file

@ -15,6 +15,7 @@ package storage
import (
"context"
"errors"
"log/slog"
"github.com/prometheus/common/model"
@ -23,7 +24,6 @@ import (
"github.com/prometheus/prometheus/model/histogram"
"github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/model/metadata"
tsdb_errors "github.com/prometheus/prometheus/tsdb/errors"
)
type fanout struct {
@ -82,11 +82,14 @@ func (f *fanout) Querier(mint, maxt int64) (Querier, error) {
querier, err := storage.Querier(mint, maxt)
if err != nil {
// Close already open Queriers, append potential errors to returned error.
errs := tsdb_errors.NewMulti(err, primary.Close())
for _, q := range secondaries {
errs.Add(q.Close())
errs := []error{
err,
primary.Close(),
}
return nil, errs.Err()
for _, q := range secondaries {
errs = append(errs, q.Close())
}
return nil, errors.Join(errs...)
}
if _, ok := querier.(noopQuerier); !ok {
secondaries = append(secondaries, querier)
@ -106,11 +109,14 @@ func (f *fanout) ChunkQuerier(mint, maxt int64) (ChunkQuerier, error) {
querier, err := storage.ChunkQuerier(mint, maxt)
if err != nil {
// Close already open Queriers, append potential errors to returned error.
errs := tsdb_errors.NewMulti(err, primary.Close())
for _, q := range secondaries {
errs.Add(q.Close())
errs := []error{
err,
primary.Close(),
}
return nil, errs.Err()
for _, q := range secondaries {
errs = append(errs, q.Close())
}
return nil, errors.Join(errs...)
}
secondaries = append(secondaries, querier)
}
@ -132,11 +138,13 @@ func (f *fanout) Appender(ctx context.Context) Appender {
// Close closes the storage and all its underlying resources.
func (f *fanout) Close() error {
errs := tsdb_errors.NewMulti(f.primary.Close())
for _, s := range f.secondaries {
errs.Add(s.Close())
errs := []error{
f.primary.Close(),
}
return errs.Err()
for _, s := range f.secondaries {
errs = append(errs, s.Close())
}
return errors.Join(errs...)
}
// fanoutAppender implements Appender.