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: Skip paused folders in aggregated completion loop (fixes #8219) (#8220)

Browse Source 
Locally paused folders will fail on checkFolderRunningLocked() and
therefore abort the loop.  Avoid this by skipping paused folders
directly.

Co-authored-by: Jakob Borg <jakob@kastelo.net>
This commit is contained in:
André Colomb 2022-08-10 08:50:19 +02:00 committed by GitHub
parent 28c660e41d
commit 4d4bfe8032
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/model/model.go
View File

@ -877,9 +877,14 @@ func (m *model) Completion(device protocol.DeviceID, folder string) (FolderCompl
// We want completion for all (shared) folders as an aggregate. // We want completion for all (shared) folders as an aggregate.
var comp FolderCompletion var comp FolderCompletion
for _, fcfg := range m.cfg.FolderList() { for _, fcfg := range m.cfg.FolderList() {
if fcfg.Paused {
continue
}
if device == protocol.LocalDeviceID || fcfg.SharedWith(device) { if device == protocol.LocalDeviceID || fcfg.SharedWith(device) {
folderComp, err := m.folderCompletion(device, fcfg.ID) folderComp, err := m.folderCompletion(device, fcfg.ID)
if err != nil { if errors.Is(err, ErrFolderPaused) {
continue
} else if err != nil {
return FolderCompletion{}, err return FolderCompletion{}, err
} }
comp.add(folderComp) comp.add(folderComp)