summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Borg <jakob@nym.se>2016-04-30 14:16:08 +0200
committerJakob Borg <jakob@nym.se>2016-04-30 14:16:16 +0200
commitc08cb6544b86efbea2729d48eab9d4d1fe5d3ddf (patch)
treed909dada496c3f2df5aa93e2b01e7090e02b1141
parent94c6110f2e10ab8dbb0a416556701317ecd437cc (diff)
lib/db: Fix zero length global version lists in db checkv0.12-dbc
-rw-r--r--lib/db/leveldb_dbinstance.go27
1 files changed, 26 insertions, 1 deletions
diff --git a/lib/db/leveldb_dbinstance.go b/lib/db/leveldb_dbinstance.go
index b333f7f0ae..5dbb8b7d65 100644
--- a/lib/db/leveldb_dbinstance.go
+++ b/lib/db/leveldb_dbinstance.go
@@ -557,12 +557,37 @@ func (db *Instance) checkGlobals(folder []byte, globalSize *sizeTracker) {
panic(err)
}
+ name := db.globalKeyName(gk)
+
+ if len(vl.versions) == 0 {
+ // A zero length version list is not OK here. If the file exists
+ // at all it should contain, at the very least, our local
+ // version. If we don't have a local version then the global
+ // entry should be deleted.
+
+ fi, ok := t.getFile(folder, protocol.LocalDeviceID[:], name)
+ if !ok {
+ // No local version of the file. Delete and move on.
+ t.Batch.Delete(dbi.Key())
+ continue
+ }
+
+ // We have a local version. Set the version list to point to it,
+ // write it, and continue.
+ vl.versions = append(vl.versions, fileVersion{
+ fi.Version,
+ protocol.LocalDeviceID[:],
+ })
+ t.Put(dbi.Key(), vl.MustMarshalXDR())
+ t.checkFlush()
+ continue
+ }
+
// Check the global version list for consistency. An issue in previous
// versions of goleveldb could result in reordered writes so that
// there are global entries pointing to no longer existing files. Here
// we find those and clear them out.
- name := db.globalKeyName(gk)
var newVL versionList
for i, version := range vl.versions {
fk = db.deviceKeyInto(fk[:cap(fk)], folder, version.device, name)