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

Merge pull request #644 from codesome/error-wrap

Browse source 
Check error before wrapping
This commit is contained in:
Bartek Płotka 2019-07-02 11:53:53 +01:00 committed by GitHub
parent ee010e9fab 0dcaf10564
commit dc657df591
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
block.go
View file

@ -453,7 +453,10 @@ func (r blockIndexReader) LabelValues(names ...string) (index.StringTuples, erro
func (r blockIndexReader) Postings(name, value string) (index.Postings, error) { func (r blockIndexReader) Postings(name, value string) (index.Postings, error) {
p, err := r.ir.Postings(name, value) p, err := r.ir.Postings(name, value)
return p, errors.Wrapf(err, "block: %s", r.b.Meta().ULID) if err != nil {
return p, errors.Wrapf(err, "block: %s", r.b.Meta().ULID)
}
return p, nil
} }
func (r blockIndexReader) SortedPostings(p index.Postings) index.Postings { func (r blockIndexReader) SortedPostings(p index.Postings) index.Postings {
@ -461,11 +464,10 @@ func (r blockIndexReader) SortedPostings(p index.Postings) index.Postings {
} }
func (r blockIndexReader) Series(ref uint64, lset *labels.Labels, chks *[]chunks.Meta) error { func (r blockIndexReader) Series(ref uint64, lset *labels.Labels, chks *[]chunks.Meta) error {
return errors.Wrapf( if err := r.ir.Series(ref, lset, chks); err != nil {
r.ir.Series(ref, lset, chks), return errors.Wrapf(err, "block: %s", r.b.Meta().ULID)
"block: %s", }
r.b.Meta().ULID, return nil
)
} }
func (r blockIndexReader) LabelIndices() ([][]string, error) { func (r blockIndexReader) LabelIndices() ([][]string, error) {