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

lib/db: Don't put truncated files (ref #6855, ref #6501) (#6888)

Browse Source
This commit is contained in:
Simon Frei
2020-08-18 09:20:12 +02:00
committed by GitHub
parent 9c2117f08e
commit 8f5215878b
5 changed files with 158 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/lowlevel.go
+5 -5
View File
@@ -149,7 +149,7 @@ func (db *Lowlevel) updateRemoteFiles(folder, device []byte, fs []protocol.FileI
meta.addFile(devID, f)
l.Debugf("insert; folder=%q device=%v %v", folder, devID, f)
if err := t.putFile(dk, f, false); err != nil {
if err := t.putFile(dk, f); err != nil {
return err
}
@@ -240,7 +240,7 @@ func (db *Lowlevel) updateLocalFiles(folder []byte, fs []protocol.FileInfo, meta
meta.addFile(protocol.LocalDeviceID, f)
l.Debugf("insert (local); folder=%q %v", folder, f)
if err := t.putFile(dk, f, false); err != nil {
if err := t.putFile(dk, f); err != nil {
return err
}
@@ -956,11 +956,11 @@ func (db *Lowlevel) repairSequenceGCLocked(folderStr string, meta *metadataTrack
var sk sequenceKey
for it.Next() {
intf, err := t.unmarshalTrunc(it.Value(), true)
intf, err := t.unmarshalTrunc(it.Value(), false)
if err != nil {
return 0, err
}
fi := intf.(FileInfoTruncated)
fi := intf.(protocol.FileInfo)
if sk, err = t.keyer.GenerateSequenceKey(sk, folder, fi.Sequence); err != nil {
return 0, err
}
@@ -979,7 +979,7 @@ func (db *Lowlevel) repairSequenceGCLocked(folderStr string, meta *metadataTrack
if err := t.Put(sk, it.Key()); err != nil {
return 0, err
}
if err := t.putFile(it.Key(), fi.copyToFileInfo(), true); err != nil {
if err := t.putFile(it.Key(), fi); err != nil {
return 0, err
}
}