octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-08 22:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/db: Be more lenient during migration (fixes #6397) (#6398)

Browse Source
This commit is contained in:
Jakob Borg 2020-03-06 20:50:55 +01:00
parent 52e72e0122
commit db02545ef3
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/db/schemaupdater.go
View File

@ -452,7 +452,16 @@ func (db *schemaUpdater) updateSchemato9(prev int) error {
metas := make(map[string]*metadataTracker) metas := make(map[string]*metadataTracker)
for it.Next() { for it.Next() {
intf, err := t.unmarshalTrunc(it.Value(), false) intf, err := t.unmarshalTrunc(it.Value(), false)
if err != nil { if backend.IsNotFound(err) {
// Unmarshal error due to missing parts (block list), probably
// due to a bad migration in a previous RC. Drop this key, as
// getFile would anyway return this as a "not found" in the
// normal flow of things.
if err := t.Delete(it.Key()); err != nil {
return err
}
continue
} else if err != nil {
return err return err
} }
fi := intf.(protocol.FileInfo) fi := intf.(protocol.FileInfo)