RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix loading of persisted blocks

This commit is contained in:
Fabian Reinartz 2017-03-09 15:40:13 +01:00
parent 5876a3303c
commit 32c32013a6
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db.go
View File

@ -369,10 +369,7 @@ func (db *DB) reloadBlocks() error {
} }
heads = append(heads, b.(*headBlock)) heads = append(heads, b.(*headBlock))
} else { } else {
if ok && meta.ULID != b.Meta().ULID { if !ok || meta.ULID != b.Meta().ULID {
if err := b.Close(); err != nil {
return err
}
b, err = newPersistedBlock(dirs[i]) b, err = newPersistedBlock(dirs[i])
if err != nil { if err != nil {
return errors.Wrapf(err, "open persisted block %s", dirs[i]) return errors.Wrapf(err, "open persisted block %s", dirs[i])
@ -385,7 +382,7 @@ func (db *DB) reloadBlocks() error {
} }
for seq, b := range db.seqBlocks { for seq, b := range db.seqBlocks {
if _, ok := seqBlocks[seq]; !ok { if nb, ok := seqBlocks[seq]; !ok || nb != b {
if err := b.Close(); err != nil { if err := b.Close(); err != nil {
return errors.Wrapf(err, "closing removed block %d", b.Meta().Sequence) return errors.Wrapf(err, "closing removed block %d", b.Meta().Sequence)
} }