felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

lib/db: Ignore not found on delete in recalcGlobal (ref #7026) (#7041)

Browse Source
This commit is contained in:
Simon Frei
2020-10-19 08:28:53 +02:00
committed by GitHub
parent 8e8e30dc7b
commit 23c935b05a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/lowlevel.go
+3 -3
View File
@@ -457,7 +457,7 @@ func (db *Lowlevel) checkGlobals(folder []byte) error {
for dbi.Next() { for dbi.Next() {
var vl VersionList var vl VersionList
if err := vl.Unmarshal(dbi.Value()); err != nil || vl.Empty() { 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 return err
} }
continue continue
@@ -486,7 +486,7 @@ func (db *Lowlevel) checkGlobals(folder []byte) error {
} }
if newVL.Empty() { if newVL.Empty() {
if err := t.Delete(dbi.Key()); err != nil { if err := t.Delete(dbi.Key()); err != nil && !backend.IsNotFound(err) {
return err return err
} }
} else if changed { } else if changed {
@@ -880,7 +880,7 @@ func (db *Lowlevel) recalcMeta(folderStr string) (*metadataTracker, error) {
meta := newMetadataTracker(db.keyer) meta := newMetadataTracker(db.keyer)
if err := db.checkGlobals(folder); err != nil { 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)) t, err := db.newReadWriteTransaction(meta.CommitHook(folder))