mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-12 22:37:27 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

simplify closers

Browse source 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
This commit is contained in:
Krasi Georgiev 2019-02-08 13:35:32 +02:00
parent e138c7ed7e
commit d48606827c
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
block.go
View file

@ -16,6 +16,7 @@ package tsdb
import ( import (
"encoding/json" "encoding/json"
"io"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@ -273,6 +274,14 @@ func OpenBlock(logger log.Logger, dir string, pool chunkenc.Pool) (pb *Block, er
if logger == nil { if logger == nil {
logger = log.NewNopLogger() logger = log.NewNopLogger()
} }
var closers []io.Closer
defer func() {
if err != nil {
for _, c := range closers {
c.Close()
}
}
}()
meta, err := readMetaFile(dir) meta, err := readMetaFile(dir)
if err != nil { if err != nil {
return nil, err return nil, err
@ -282,31 +291,19 @@ func OpenBlock(logger log.Logger, dir string, pool chunkenc.Pool) (pb *Block, er
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer func() { closers = append(closers, cr)
if err != nil {
cr.Close()
}
}()
ir, err := index.NewFileReader(filepath.Join(dir, indexFilename)) ir, err := index.NewFileReader(filepath.Join(dir, indexFilename))
if err != nil { if err != nil {
return nil, err return nil, err
} }
closers = append(closers, ir)
defer func() {
if err != nil {
ir.Close()
}
}()
tr, tsr, err := readTombstones(dir) tr, tsr, err := readTombstones(dir)
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer func() { closers = append(closers, tr)
if err != nil {
tr.Close()
}
}()
// TODO refactor to set this at block creation time as // TODO refactor to set this at block creation time as
// that would be the logical place for a block size to be calculated. // that would be the logical place for a block size to be calculated.