Skip to content
This repository was archived by the owner on Aug 13, 2019. It is now read-only.

Commit 3ab5105

Browse files
few tiny bugs , no biggie just panicing
1 parent ffb3310 commit 3ab5105

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

db.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,15 @@ func (db *DB) reload(deleteable ...string) (err error) {
505505
for _, dir := range dirs {
506506
meta, err := readMetaFile(dir)
507507
if err != nil {
508-
deleteable = append(deleteable, dir)
509-
level.Error(db.logger).Log("msg", "dir set for deletion due to error in the meta file", "dir", dir, "err", err.Error())
508+
if os.IsNotExist(err) {
509+
deleteable = append(deleteable, dir)
510+
level.Error(db.logger).Log("msg", "dir set for deletion due to error in the meta file", "dir", dir, "err", err.Error())
511+
continue
512+
}
513+
return errors.Wrapf(err, "read meta information %s", dir)
514+
}
515+
516+
if stringsContain(deleteable, dir) {
510517
continue
511518
}
512519

repair.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func repairBadIndexVersion(logger log.Logger, dir string) error {
3131
}
3232
d = path.Join(dir, d)
3333
// Skip dirs with missing meta. These will be deleted when reloading the db.
34-
if _, err := os.Stat(filepath.Join(dir, metaFilename)); os.IsNotExist(err) {
34+
if _, err := os.Stat(filepath.Join(d, metaFilename)); os.IsNotExist(err) {
3535
continue
3636
}
3737

repair_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func TestRepairBadIndexVersion(t *testing.T) {
7676
}
7777

7878
// On DB opening all blocks in the base dir should be repaired.
79-
db, _ := Open("testdata/repair_index_version", nil, nil, nil)
79+
db, err := Open("testdata/repair_index_version", nil, nil, nil)
8080
if err != nil {
8181
t.Fatal(err)
8282
}

0 commit comments

Comments
 (0)