From 73e2ce1bd6436e6818389d4ca87a554e64b980b0 Mon Sep 17 00:00:00 2001 From: Gayathri Venkatesh Date: Wed, 14 Oct 2020 15:05:24 +0530 Subject: [PATCH] Do not ignore reload errors in compactHead (#8051) * Modified unknownRefs to unknownRefs.Load() Signed-off-by: GayathriVenkatesh * Modified db.go Signed-off-by: GayathriVenkatesh * Revert "Modified unknownRefs to unknownRefs.Load()" This reverts commit 79caf595fa9b9193878dc0dd9dec17d58851ae42. Signed-off-by: GayathriVenkatesh * Made changes to reload error in db.go Signed-off-by: GayathriVenkatesh --- tsdb/db.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tsdb/db.go b/tsdb/db.go index 3fe4c94d9..4c70a4052 100644 --- a/tsdb/db.go +++ b/tsdb/db.go @@ -835,8 +835,11 @@ func (db *DB) compactHead(head *RangeHead) (err error) { runtime.GC() if err := db.reload(); err != nil { - if err := os.RemoveAll(filepath.Join(db.dir, uid.String())); err != nil { - return errors.Wrapf(err, "delete persisted head block after failed db reload:%s", uid) + if errRemoveAll := os.RemoveAll(filepath.Join(db.dir, uid.String())); errRemoveAll != nil { + var merr tsdb_errors.MultiError + merr.Add(errors.Wrap(err, "reload blocks")) + merr.Add(errors.Wrapf(errRemoveAll, "delete persisted head block after failed db reload:%s", uid)) + return merr.Err() } return errors.Wrap(err, "reload blocks") } -- GitLab