lib/db: Don't panic

So, when first implementing the database layer I added panics on every
unexpected error condition mostly to be sure to flush out bugs and
inconsistencies. Then it became sort of standard, and we don't seem to
have many bugs here any more so the panics are usually caused by things
like checksum errors on read. But it's not an optimal user experience to
crash all the time.

Here I've weeded out most of the panics, while retaining a few "can't
happen" ones like errors on marshalling and write that we really can't
recover from.

For the rest, I'm mostly treating any read error as "entry didn't
exist". This should mean we'll rescan the file and correct the info (if
scanning) or treat it as a new file and do conflict handling (when
pulling). In some cases things like our global stats may be slightly
incorrect until a restart, if a database entry goes suddenly missing
during runtime.

All in all, I think this makes us a bit more robust and friendly without
introducing too many risks for the user. If the database is truly toast,
probably many other things on the system will be toast as well...

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4118
This commit is contained in:
Jakob Borg 2017-04-25 22:52:37 +00:00 committed by Audrius Butkevicius
parent 26654df48c
commit 488444354b
3 changed files with 72 additions and 79 deletions

View File

@ -69,13 +69,15 @@ func getFile(db dbReader, key []byte) (protocol.FileInfo, bool) {
return protocol.FileInfo{}, false return protocol.FileInfo{}, false
} }
if err != nil { if err != nil {
panic(err) l.Debugln("surprise error:", err)
return protocol.FileInfo{}, false
} }
var f protocol.FileInfo var f protocol.FileInfo
err = f.Unmarshal(bs) err = f.Unmarshal(bs)
if err != nil { if err != nil {
panic(err) l.Debugln("unmarshal error:", err)
return protocol.FileInfo{}, false
} }
return f, true return f, true
} }

View File

@ -197,8 +197,16 @@ func (db *Instance) updateFiles(folder, device []byte, fs []protocol.FileInfo, l
for _, f := range fs { for _, f := range fs {
name := []byte(f.Name) name := []byte(f.Name)
fk = db.deviceKeyInto(fk[:cap(fk)], folder, device, name) fk = db.deviceKeyInto(fk[:cap(fk)], folder, device, name)
// Get and unmarshal the file entry. If it doesn't exist or can't be
// unmarshalled we'll add it as a new entry.
bs, err := t.Get(fk, nil) bs, err := t.Get(fk, nil)
if err == leveldb.ErrNotFound { var ef FileInfoTruncated
if err == nil {
err = ef.Unmarshal(bs)
}
if err != nil {
if isLocalDevice { if isLocalDevice {
localSize.addFile(f) localSize.addFile(f)
} }
@ -212,11 +220,6 @@ func (db *Instance) updateFiles(folder, device []byte, fs []protocol.FileInfo, l
continue continue
} }
var ef FileInfoTruncated
err = ef.Unmarshal(bs)
if err != nil {
panic(err)
}
// The Invalid flag might change without the version being bumped. // The Invalid flag might change without the version being bumped.
if !ef.Version.Equal(f.Version) || ef.Invalid != f.Invalid { if !ef.Version.Equal(f.Version) || ef.Invalid != f.Invalid {
if isLocalDevice { if isLocalDevice {
@ -262,7 +265,8 @@ func (db *Instance) withHave(folder, device, prefix []byte, truncate bool, fn It
// we need to copy it. // we need to copy it.
f, err := unmarshalTrunc(append([]byte{}, dbi.Value()...), truncate) f, err := unmarshalTrunc(append([]byte{}, dbi.Value()...), truncate)
if err != nil { if err != nil {
panic(err) l.Debugln("unmarshal error:", err)
continue
} }
if cont := fn(f); !cont { if cont := fn(f); !cont {
return return
@ -286,7 +290,8 @@ func (db *Instance) withAllFolderTruncated(folder []byte, fn func(device []byte,
// we need to copy it. // we need to copy it.
err := f.Unmarshal(append([]byte{}, dbi.Value()...)) err := f.Unmarshal(append([]byte{}, dbi.Value()...))
if err != nil { if err != nil {
panic(err) l.Debugln("unmarshal error:", err)
continue
} }
switch f.Name { switch f.Name {
@ -315,32 +320,35 @@ func (db *Instance) getGlobal(folder, file []byte, truncate bool) (FileIntf, boo
defer t.close() defer t.close()
bs, err := t.Get(k, nil) bs, err := t.Get(k, nil)
if err == leveldb.ErrNotFound {
return nil, false
}
if err != nil { if err != nil {
panic(err) return nil, false
} }
var vl VersionList var vl VersionList
err = vl.Unmarshal(bs) err = vl.Unmarshal(bs)
if err == leveldb.ErrNotFound {
return nil, false
}
if err != nil { if err != nil {
panic(err) l.Debugln("unmarshal error:", k, err)
return nil, false
} }
if len(vl.Versions) == 0 { if len(vl.Versions) == 0 {
l.Debugln(k) l.Debugln("no versions:", k)
panic("no versions?") return nil, false
} }
k = db.deviceKey(folder, vl.Versions[0].Device, file) k = db.deviceKey(folder, vl.Versions[0].Device, file)
bs, err = t.Get(k, nil) bs, err = t.Get(k, nil)
if err != nil { if err != nil {
panic(err) l.Debugln("surprise error:", k, err)
return nil, false
} }
fi, err := unmarshalTrunc(bs, truncate) fi, err := unmarshalTrunc(bs, truncate)
if err != nil { if err != nil {
panic(err) l.Debugln("unmarshal error:", k, err)
return nil, false
} }
return fi, true return fi, true
} }
@ -362,11 +370,12 @@ func (db *Instance) withGlobal(folder, prefix []byte, truncate bool, fn Iterator
var vl VersionList var vl VersionList
err := vl.Unmarshal(dbi.Value()) err := vl.Unmarshal(dbi.Value())
if err != nil { if err != nil {
panic(err) l.Debugln("unmarshal error:", err)
continue
} }
if len(vl.Versions) == 0 { if len(vl.Versions) == 0 {
l.Debugln(dbi.Key()) l.Debugln("no versions:", dbi.Key())
panic("no versions?") continue
} }
name := db.globalKeyName(dbi.Key()) name := db.globalKeyName(dbi.Key())
@ -377,22 +386,14 @@ func (db *Instance) withGlobal(folder, prefix []byte, truncate bool, fn Iterator
fk = db.deviceKeyInto(fk[:cap(fk)], folder, vl.Versions[0].Device, name) fk = db.deviceKeyInto(fk[:cap(fk)], folder, vl.Versions[0].Device, name)
bs, err := t.Get(fk, nil) bs, err := t.Get(fk, nil)
if err != nil { if err != nil {
l.Debugf("folder: %q (%x)", folder, folder) l.Debugln("surprise error:", err)
l.Debugf("key: %q (%x)", dbi.Key(), dbi.Key()) continue
l.Debugf("vl: %v", vl)
l.Debugf("vl.Versions[0].Device: %x", vl.Versions[0].Device)
l.Debugf("name: %q (%x)", name, name)
l.Debugf("fk: %q", fk)
l.Debugf("fk: %x %x %x",
fk[keyPrefixLen:keyPrefixLen+keyFolderLen],
fk[keyPrefixLen+keyFolderLen:keyPrefixLen+keyFolderLen+keyDeviceLen],
fk[keyPrefixLen+keyFolderLen+keyDeviceLen:])
panic(err)
} }
f, err := unmarshalTrunc(bs, truncate) f, err := unmarshalTrunc(bs, truncate)
if err != nil { if err != nil {
panic(err) l.Debugln("unmarshal error:", err)
continue
} }
if cont := fn(f); !cont { if cont := fn(f); !cont {
@ -408,13 +409,15 @@ func (db *Instance) availability(folder, file []byte) []protocol.DeviceID {
return nil return nil
} }
if err != nil { if err != nil {
panic(err) l.Debugln("surprise error:", err)
return nil
} }
var vl VersionList var vl VersionList
err = vl.Unmarshal(bs) err = vl.Unmarshal(bs)
if err != nil { if err != nil {
panic(err) l.Debugln("unmarshal error:", err)
return nil
} }
var devices []protocol.DeviceID var devices []protocol.DeviceID
@ -442,11 +445,12 @@ nextFile:
var vl VersionList var vl VersionList
err := vl.Unmarshal(dbi.Value()) err := vl.Unmarshal(dbi.Value())
if err != nil { if err != nil {
panic(err) l.Debugln("unmarshal error:", err)
continue
} }
if len(vl.Versions) == 0 { if len(vl.Versions) == 0 {
l.Debugln(dbi.Key()) l.Debugln("no versions:", dbi.Key())
panic("no versions?") continue
} }
have := false // If we have the file, any version have := false // If we have the file, any version
@ -477,21 +481,14 @@ nextFile:
fk = db.deviceKeyInto(fk[:cap(fk)], folder, vl.Versions[i].Device, name) fk = db.deviceKeyInto(fk[:cap(fk)], folder, vl.Versions[i].Device, name)
bs, err := t.Get(fk, nil) bs, err := t.Get(fk, nil)
if err != nil { if err != nil {
var id protocol.DeviceID l.Debugln("surprise error:", err)
copy(id[:], device) continue nextVersion
l.Debugf("device: %v", id)
l.Debugf("need: %v, have: %v", need, have)
l.Debugf("key: %q (%x)", dbi.Key(), dbi.Key())
l.Debugf("vl: %v", vl)
l.Debugf("i: %v", i)
l.Debugf("fk: %q (%x)", fk, fk)
l.Debugf("name: %q (%x)", name, name)
panic(err)
} }
gf, err := unmarshalTrunc(bs, truncate) gf, err := unmarshalTrunc(bs, truncate)
if err != nil { if err != nil {
panic(err) l.Debugln("unmarshal error:", err)
continue nextVersion
} }
if gf.IsInvalid() { if gf.IsInvalid() {
@ -579,7 +576,8 @@ func (db *Instance) checkGlobals(folder []byte, globalSize *sizeTracker) {
var vl VersionList var vl VersionList
err := vl.Unmarshal(dbi.Value()) err := vl.Unmarshal(dbi.Value())
if err != nil { if err != nil {
panic(err) l.Debugln("unmarshal error:", err)
continue
} }
// Check the global version list for consistency. An issue in previous // Check the global version list for consistency. An issue in previous
@ -597,16 +595,15 @@ func (db *Instance) checkGlobals(folder []byte, globalSize *sizeTracker) {
continue continue
} }
if err != nil { if err != nil {
panic(err) l.Debugln("surprise error:", err)
return
} }
newVL.Versions = append(newVL.Versions, version) newVL.Versions = append(newVL.Versions, version)
if i == 0 { if i == 0 {
fi, ok := t.getFile(folder, version.Device, name) if fi, ok := t.getFile(folder, version.Device, name); ok {
if !ok { globalSize.addFile(fi)
panic("nonexistent global master file")
} }
globalSize.addFile(fi)
} }
} }

View File

@ -89,21 +89,14 @@ func (t readWriteTransaction) updateGlobal(folder, device []byte, file protocol.
l.Debugf("update global; folder=%q device=%v file=%q version=%d", folder, protocol.DeviceIDFromBytes(device), file.Name, file.Version) l.Debugf("update global; folder=%q device=%v file=%q version=%d", folder, protocol.DeviceIDFromBytes(device), file.Name, file.Version)
name := []byte(file.Name) name := []byte(file.Name)
gk := t.db.globalKey(folder, name) gk := t.db.globalKey(folder, name)
svl, err := t.Get(gk, nil) svl, _ := t.Get(gk, nil) // skip error, we check len(svl) != 0 later
if err != nil && err != leveldb.ErrNotFound {
panic(err)
}
var fl VersionList var fl VersionList
var oldFile protocol.FileInfo var oldFile protocol.FileInfo
var hasOldFile bool var hasOldFile bool
// Remove the device from the current version list // Remove the device from the current version list
if len(svl) != 0 { if len(svl) != 0 {
err = fl.Unmarshal(svl) fl.Unmarshal(svl) // skip error, range handles success case
if err != nil {
panic(err)
}
for i := range fl.Versions { for i := range fl.Versions {
if bytes.Equal(fl.Versions[i].Device, device) { if bytes.Equal(fl.Versions[i].Device, device) {
if fl.Versions[i].Version.Equal(file.Version) { if fl.Versions[i].Version.Equal(file.Version) {
@ -147,11 +140,10 @@ func (t readWriteTransaction) updateGlobal(folder, device []byte, file protocol.
// "Greater" in the condition above is just based on the device // "Greater" in the condition above is just based on the device
// IDs in the version vector, which is not the only thing we use // IDs in the version vector, which is not the only thing we use
// to determine the winner.) // to determine the winner.)
//
// A surprise missing file entry here is counted as a win for us.
of, ok := t.getFile(folder, fl.Versions[i].Device, name) of, ok := t.getFile(folder, fl.Versions[i].Device, name)
if !ok { if !ok || file.WinsConflict(of) {
panic("file referenced in version list does not exist")
}
if file.WinsConflict(of) {
fl.Versions = insertVersion(fl.Versions, i, nv) fl.Versions = insertVersion(fl.Versions, i, nv)
insertedAt = i insertedAt = i
goto done goto done
@ -174,11 +166,11 @@ done:
globalSize.removeFile(oldFile) globalSize.removeFile(oldFile)
} else if len(fl.Versions) > 1 { } else if len(fl.Versions) > 1 {
// The previous newest version is now at index 1, grab it from there. // The previous newest version is now at index 1, grab it from there.
oldFile, ok := t.getFile(folder, fl.Versions[1].Device, name) if oldFile, ok := t.getFile(folder, fl.Versions[1].Device, name); ok {
if !ok { // A failure to get the file here is surprising and our
panic("file referenced in version list does not exist") // global size data will be incorrect until a restart...
globalSize.removeFile(oldFile)
} }
globalSize.removeFile(oldFile)
} }
} }
} }
@ -206,7 +198,8 @@ func (t readWriteTransaction) removeFromGlobal(folder, device, file []byte, glob
var fl VersionList var fl VersionList
err = fl.Unmarshal(svl) err = fl.Unmarshal(svl)
if err != nil { if err != nil {
panic(err) l.Debugln("unmarshal error:", err)
return
} }
removed := false removed := false
@ -215,7 +208,8 @@ func (t readWriteTransaction) removeFromGlobal(folder, device, file []byte, glob
if i == 0 && globalSize != nil { if i == 0 && globalSize != nil {
f, ok := t.getFile(folder, device, file) f, ok := t.getFile(folder, device, file)
if !ok { if !ok {
panic("removing nonexistent file") // didn't exist anyway, apparently
continue
} }
globalSize.removeFile(f) globalSize.removeFile(f)
removed = true removed = true
@ -231,11 +225,11 @@ func (t readWriteTransaction) removeFromGlobal(folder, device, file []byte, glob
l.Debugf("new global after remove: %v", fl) l.Debugf("new global after remove: %v", fl)
t.Put(gk, mustMarshal(&fl)) t.Put(gk, mustMarshal(&fl))
if removed { if removed {
f, ok := t.getFile(folder, fl.Versions[0].Device, file) if f, ok := t.getFile(folder, fl.Versions[0].Device, file); ok {
if !ok { // A failure to get the file here is surprising and our
panic("new global is nonexistent file") // global size data will be incorrect until a restart...
globalSize.addFile(f)
} }
globalSize.addFile(f)
} }
} }
} }