octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-02 11:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Use right db snap when scanning recvonly folder (#6769)

Browse Source
This commit is contained in:
Simon Frei 2020-06-21 09:28:29 +02:00 committed by GitHub
parent 3fcf22ed5d
commit f66e57947b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lib/model/folder.go
View File

@ -418,38 +418,39 @@ func (f *folder) scanSubdirs(subDirs []string) error {
EventLogger: f.evLogger,
})
batchFn := func(fs []protocol.FileInfo) error {
batch := newFileInfoBatch(func(fs []protocol.FileInfo) error {
if err := f.getHealthErrorWithoutIgnores(); err != nil {
l.Debugf("Stopping scan of folder %s due to: %s", f.Description(), err)
return err
}
f.updateLocalsFromScanning(fs)
return nil
}
})
var batchAppend func(protocol.FileInfo, *db.Snapshot)
// Resolve items which are identical with the global state.
if f.localFlags&protocol.FlagLocalReceiveOnly != 0 {
oldBatchFn := batchFn // can't reference batchFn directly (recursion)
batchFn = func(fs []protocol.FileInfo) error {
for i := range fs {
switch gf, ok := snap.GetGlobal(fs[i].Name); {
case !ok:
continue
case gf.IsEquivalentOptional(fs[i], f.ModTimeWindow(), false, false, protocol.FlagLocalReceiveOnly):
// What we have locally is equivalent to the global file.
fs[i].Version = fs[i].Version.Merge(gf.Version)
fallthrough
case fs[i].IsDeleted() && gf.IsReceiveOnlyChanged():
// Our item is deleted and the global item is our own
// receive only file. We can't delete file infos, so
// we just pretend it is a normal deleted file (nobody
// cares about that).
fs[i].LocalFlags &^= protocol.FlagLocalReceiveOnly
}
if f.localFlags&protocol.FlagLocalReceiveOnly == 0 {
batchAppend = func(fi protocol.FileInfo, _ *db.Snapshot) {
batch.append(fi)
}
} else {
batchAppend = func(fi protocol.FileInfo, snap *db.Snapshot) {
switch gf, ok := snap.GetGlobal(fi.Name); {
case !ok:
case gf.IsEquivalentOptional(fi, f.ModTimeWindow(), false, false, protocol.FlagLocalReceiveOnly):
// What we have locally is equivalent to the global file.
fi.Version = fi.Version.Merge(gf.Version)
fallthrough
case fi.IsDeleted() && gf.IsReceiveOnlyChanged():
// Our item is deleted and the global item is our own
// receive only file. We can't delete file infos, so
// we just pretend it is a normal deleted file (nobody
// cares about that).
fi.LocalFlags &^= protocol.FlagLocalReceiveOnly
}
return oldBatchFn(fs)
batch.append(fi)
}
}
batch := newFileInfoBatch(batchFn)
// Schedule a pull after scanning, but only if we actually detected any
// changes.
@ -472,12 +473,12 @@ func (f *folder) scanSubdirs(subDirs []string) error {
return err
}
batch.append(res.File)
batchAppend(res.File, snap)
changes++
if f.localFlags&protocol.FlagLocalReceiveOnly == 0 {
if nf, ok := f.findRename(snap, mtimefs, res.File, alreadyUsed); ok {
batch.append(nf)
batchAppend(nf, snap)
changes++
}
}
@ -523,7 +524,7 @@ func (f *folder) scanSubdirs(subDirs []string) error {
for _, file := range toIgnore {
l.Debugln("marking file as ignored", file)
nf := file.ConvertToIgnoredFileInfo(f.shortID)
batch.append(nf)
batchAppend(nf, snap)
changes++
if err := batch.flushIfFull(); err != nil {
iterError = err
@ -550,7 +551,7 @@ func (f *folder) scanSubdirs(subDirs []string) error {
l.Debugln("marking file as ignored", file)
nf := file.ConvertToIgnoredFileInfo(f.shortID)
batch.append(nf)
batchAppend(nf, snap)
changes++
case file.IsIgnored() && !ignored:
@ -579,7 +580,7 @@ func (f *folder) scanSubdirs(subDirs []string) error {
nf.Version = protocol.Vector{}
}
batch.append(nf)
batchAppend(nf, snap)
changes++
}
@ -593,7 +594,7 @@ func (f *folder) scanSubdirs(subDirs []string) error {
nf := fi.(db.FileInfoTruncated).ConvertDeletedToFileInfo()
nf.LocalFlags = 0
nf.Version = protocol.Vector{}
batch.append(nf)
batchAppend(nf, snap)
changes++
return true
@ -609,7 +610,7 @@ func (f *folder) scanSubdirs(subDirs []string) error {
for _, file := range toIgnore {
l.Debugln("marking file as ignored", f)
nf := file.ConvertToIgnoredFileInfo(f.shortID)
batch.append(nf)
batchAppend(nf, snap)
changes++
if iterError = batch.flushIfFull(); iterError != nil {
break