mirror/kopia
1
0
Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-03-16 21:28:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

upload: fixed time comparison which was sometimes causing re-hashing of contents

Browse Source 
Thanks to @ntolia for debugging.

Fixes #97
This commit is contained in:
Jarek Kowalski
2019-08-24 14:37:14 -07:00
parent 09a31fa910
commit e8a13530ae
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
snapshot/snapshotfs/upload.go
View File

@@ -357,7 +357,7 @@ type uploadWorkItem struct {
}
func metadataEquals(e1, e2 fs.Entry) bool {
if l, r := e1.ModTime(), e2.ModTime(); l != r {
if l, r := e1.ModTime(), e2.ModTime(); !l.Equal(r) {
return false
}
if l, r := e1.Mode(), e2.Mode(); l != r {
@@ -374,11 +374,15 @@ func metadataEquals(e1, e2 fs.Entry) bool {
func findCachedEntry(entry fs.Entry, prevEntries []fs.Entries) fs.Entry {
for _, e := range prevEntries {
if ent := e.FindByName(entry.Name()); ent != nil && metadataEquals(entry, ent) {
return ent
if ent := e.FindByName(entry.Name()); ent != nil {
if metadataEquals(entry, ent) {
return ent
}
log.Debugf("found non-matching entry for %v: %v %v %v", entry.Name(), ent.Mode(), ent.Size(), ent.ModTime())
}
}
log.Debugf("could not find cache entry for %v", entry.Name())
return nil
}