octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-01 03:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Detect deleted RO items scanning on non-RO (fixes #6864) (#6865)

Browse Source
This commit is contained in:
Simon Frei 2020-07-30 13:41:45 +02:00 committed by GitHub
parent 2dc2aa5d21
commit e46c8ab9ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/model/folder.go
View File

@ -557,6 +557,8 @@ func (f *folder) scanSubdirs(subDirs []string) error {
}
switch ignored := f.ignores.Match(file.Name).IsIgnored(); {
case file.IsIgnored() && ignored:
return true
case !file.IsIgnored() && ignored:
// File was not ignored at last pass but has been ignored.
if file.IsDirectory() {
@ -600,24 +602,25 @@ func (f *folder) scanSubdirs(subDirs []string) error {
// sure the file gets in sync on the following pull.
nf.Version = protocol.Vector{}
}
// Check for deleted, locally changed items that noone else has.
if f.localFlags&protocol.FlagLocalReceiveOnly != 0 && len(snap.Availability(file.Name)) == 0 {
file.LocalFlags &^= protocol.FlagLocalReceiveOnly
}
batchAppend(nf, snap)
changes++
case file.IsDeleted() && file.IsReceiveOnlyChanged() && f.localFlags&protocol.FlagLocalReceiveOnly != 0 && len(snap.Availability(file.Name)) == 0:
file.Version = protocol.Vector{}
file.LocalFlags &^= protocol.FlagLocalReceiveOnly
batchAppend(file.ConvertDeletedToFileInfo(), snap)
changes++
case file.IsDeleted() && file.LocalFlags != f.localFlags:
// No need to bump the version for a file that was
// and is deleted and just the local flags changed.
file.LocalFlags = f.localFlags
batchAppend(file.ConvertDeletedToFileInfo(), snap)
changes++
}
// Check for deleted, locally changed items that noone else has.
if f.localFlags&protocol.FlagLocalReceiveOnly == 0 {
return true
}
if !fi.IsDeleted() || !fi.IsReceiveOnlyChanged() || len(snap.Availability(fi.FileName())) > 0 {
return true
}
nf := fi.(db.FileInfoTruncated).ConvertDeletedToFileInfo()
nf.LocalFlags = 0
nf.Version = protocol.Vector{}
batchAppend(nf, snap)
changes++
return true
})

41
lib/model/model_test.go
View File

@ -3943,6 +3943,47 @@ func TestAddFolderCompletion(t *testing.T) {
}
}
func TestScanDeletedROChangedOnSR(t *testing.T) {
w, fcfg := tmpDefaultWrapper()
fcfg.Type = config.FolderTypeReceiveOnly
waiter, _ := w.SetFolder(fcfg)
waiter.Wait()
m := setupModel(w)
defer cleanupModel(m)
name := "foo"
ffs := fcfg.Filesystem()
must(t, writeFile(ffs, name, []byte(name), 0644))
m.ScanFolders()
file, ok := m.CurrentFolderFile(fcfg.ID, name)
if !ok {
t.Fatal("file missing in db")
}
// A remote must have the file, otherwise the deletion below is
// automatically resolved as not a ro-changed item.
m.IndexUpdate(device1, fcfg.ID, []protocol.FileInfo{file})
must(t, ffs.Remove(name))
m.ScanFolders()
if receiveOnlyChangedSize(t, m, fcfg.ID).Deleted != 1 {
t.Fatal("expected one receive only changed deleted item")
}
fcfg.Type = config.FolderTypeSendReceive
waiter, _ = w.SetFolder(fcfg)
waiter.Wait()
m.ScanFolders()
if receiveOnlyChangedSize(t, m, fcfg.ID).Deleted != 0 {
t.Fatal("expected no receive only changed deleted item")
}
if localSize(t, m, fcfg.ID).Deleted != 1 {
t.Fatal("expected one local deleted item")
}
}
func testConfigChangeClosesConnections(t *testing.T, expectFirstClosed, expectSecondClosed bool, pre func(config.Wrapper), fn func(config.Wrapper)) {
t.Helper()
wcfg, _ := tmpDefaultWrapper()