From cc1f6e4d4af0c1fdf00e61d4679ecca0de6b2e4a Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Thu, 20 Aug 2020 16:11:20 +0200 Subject: [PATCH] lib/db, lib/model: Cover exec-paths with debug logging (#6918) --- lib/db/lowlevel.go | 4 +++- lib/model/folder.go | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/db/lowlevel.go b/lib/db/lowlevel.go index 298630f08..ad4eea60d 100644 --- a/lib/db/lowlevel.go +++ b/lib/db/lowlevel.go @@ -140,6 +140,7 @@ func (db *Lowlevel) updateRemoteFiles(folder, device []byte, fs []protocol.FileI return err } if ok && unchanged(f, ef) { + l.Debugf("not inserting unchanged (remote); folder=%q device=%v %v", folder, devID, f) continue } @@ -148,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) + l.Debugf("insert (remote); folder=%q device=%v %v", folder, devID, f) if err := t.putFile(dk, f); err != nil { return err } @@ -196,6 +197,7 @@ func (db *Lowlevel) updateLocalFiles(folder []byte, fs []protocol.FileInfo, meta return err } if ok && unchanged(f, ef) { + l.Debugf("not inserting unchanged (local); folder=%q %v", folder, f) continue } blocksHashSame := ok && bytes.Equal(ef.BlocksHash, f.BlocksHash) diff --git a/lib/model/folder.go b/lib/model/folder.go index f226006e9..7646f5219 100644 --- a/lib/model/folder.go +++ b/lib/model/folder.go @@ -628,17 +628,20 @@ func (f *folder) scanSubdirs(subDirs []string) error { if f.localFlags&protocol.FlagLocalReceiveOnly != 0 && len(snap.Availability(file.Name)) == 0 { file.LocalFlags &^= protocol.FlagLocalReceiveOnly } + l.Debugln("marking file as deleted", nf) 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 + l.Debugln("marking deleted item that doesn't exist anywhere as not receive-only", file) 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 + l.Debugln("changing localflags on deleted item", file) batchAppend(file.ConvertDeletedToFileInfo(), snap) changes++ }