KurlesHS/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

sync: fix deadlock with --track-renames-strategy modtime - fixes #4427

Browse source 
Before this change we could exit the popRenameMap function with the
lock held.

This fixes the problem by defer-ring the unlock.

See: https://forum.rclone.org/t/track-renames-strategy-modtime-doesnt-work/16992
This commit is contained in:
Nick Craig-Wood 2020-07-15 15:05:44 +01:00
parent bcd362fcd5
commit 811b30d116
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/sync/sync.go
View file

@ -658,6 +658,7 @@ func (s *syncCopyMove) pushRenameMap(hash string, obj fs.Object) {
// renameMap or returns nil if not found. // renameMap or returns nil if not found.
func (s *syncCopyMove) popRenameMap(hash string, src fs.Object) (dst fs.Object) { func (s *syncCopyMove) popRenameMap(hash string, src fs.Object) (dst fs.Object) {
s.renameMapMu.Lock() s.renameMapMu.Lock()
defer s.renameMapMu.Unlock()
dsts, ok := s.renameMap[hash] dsts, ok := s.renameMap[hash]
if ok && len(dsts) > 0 { if ok && len(dsts) > 0 {
// Element to remove // Element to remove
@ -690,7 +691,6 @@ func (s *syncCopyMove) popRenameMap(hash string, src fs.Object) (dst fs.Object)
delete(s.renameMap, hash) delete(s.renameMap, hash)
} }
} }
s.renameMapMu.Unlock()
return dst return dst
} }