From 23c935b05ab845da97df66a179bedbc69da71d90 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Mon, 19 Oct 2020 08:28:53 +0200 Subject: [PATCH] lib/db: Ignore not found on delete in recalcGlobal (ref #7026) (#7041) --- lib/db/lowlevel.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/db/lowlevel.go b/lib/db/lowlevel.go index 3ed684b9d..314bdf2a3 100644 --- a/lib/db/lowlevel.go +++ b/lib/db/lowlevel.go @@ -457,7 +457,7 @@ func (db *Lowlevel) checkGlobals(folder []byte) error { for dbi.Next() { var vl VersionList if err := vl.Unmarshal(dbi.Value()); err != nil || vl.Empty() { - if err := t.Delete(dbi.Key()); err != nil { + if err := t.Delete(dbi.Key()); err != nil && !backend.IsNotFound(err) { return err } continue @@ -486,7 +486,7 @@ func (db *Lowlevel) checkGlobals(folder []byte) error { } if newVL.Empty() { - if err := t.Delete(dbi.Key()); err != nil { + if err := t.Delete(dbi.Key()); err != nil && !backend.IsNotFound(err) { return err } } else if changed { @@ -880,7 +880,7 @@ func (db *Lowlevel) recalcMeta(folderStr string) (*metadataTracker, error) { meta := newMetadataTracker(db.keyer) if err := db.checkGlobals(folder); err != nil { - return nil, err + return nil, fmt.Errorf("checking globals: %w", err) } t, err := db.newReadWriteTransaction(meta.CommitHook(folder))