github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-25 09:41:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sync: fix lockup with --cutoff-mode=soft and --max-duration

Browse Source 
Before this change, when using --cutoff-mode=soft and --max-duration
rclone deadlocked when the cutoff limit was reached.

This was because the sync objects Pipe became full and nothing was
emptying it because the cutoff was reached.

This changes the context for putting items into the pipe to be the one
that gets cancelled when the cutoff is reached.

See: https://forum.rclone.org/t/sync-command-hanging-using-cutoff-mode-soft-with-max-duration-time-flags/40866
This commit is contained in:
Nick Craig-Wood 2023-08-15 21:33:32 +01:00
parent c979cde002
commit 156c372cd7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/sync/sync.go
View File

@ -365,13 +365,13 @@ func (s *syncCopyMove) pairChecker(in *pipe, out *pipe, fraction int, wg *sync.W
} else { } else {
// If successful zero out the dst as it is no longer there and copy the file // If successful zero out the dst as it is no longer there and copy the file
pair.Dst = nil pair.Dst = nil
ok = out.Put(s.ctx, pair) ok = out.Put(s.inCtx, pair)
if !ok { if !ok {
return return
} }
} }
} else { } else {
ok = out.Put(s.ctx, pair) ok = out.Put(s.inCtx, pair)
if !ok { if !ok {
return return
} }
@ -389,7 +389,7 @@ func (s *syncCopyMove) pairChecker(in *pipe, out *pipe, fraction int, wg *sync.W
// If we want perfect ordering then use the transfers to delete the file // If we want perfect ordering then use the transfers to delete the file
// //
// We send src == dst, to say we want the src deleted // We send src == dst, to say we want the src deleted
ok = out.Put(s.ctx, fs.ObjectPair{Src: src, Dst: src}) ok = out.Put(s.inCtx, fs.ObjectPair{Src: src, Dst: src})
if !ok { if !ok {
return return
} }
@ -416,7 +416,7 @@ func (s *syncCopyMove) pairRenamer(in *pipe, out *pipe, fraction int, wg *sync.W
if !s.tryRename(src) { if !s.tryRename(src) {
// pass on if not renamed // pass on if not renamed
fs.Debugf(src, "Need to transfer - No matching file found at Destination") fs.Debugf(src, "Need to transfer - No matching file found at Destination")
ok = out.Put(s.ctx, pair) ok = out.Put(s.inCtx, pair)
if !ok { if !ok {
return return
} }
@ -897,7 +897,7 @@ func (s *syncCopyMove) run() error {
s.makeRenameMap() s.makeRenameMap()
// Attempt renames for all the files which don't have a matching dst // Attempt renames for all the files which don't have a matching dst
for _, src := range s.renameCheck { for _, src := range s.renameCheck {
ok := s.toBeRenamed.Put(s.ctx, fs.ObjectPair{Src: src, Dst: nil}) ok := s.toBeRenamed.Put(s.inCtx, fs.ObjectPair{Src: src, Dst: nil})
if !ok { if !ok {
break break
} }
@ -1032,7 +1032,7 @@ func (s *syncCopyMove) SrcOnly(src fs.DirEntry) (recurse bool) {
if !NoNeedTransfer { if !NoNeedTransfer {
// No need to check since doesn't exist // No need to check since doesn't exist
fs.Debugf(src, "Need to transfer - File not found at Destination") fs.Debugf(src, "Need to transfer - File not found at Destination")
ok := s.toBeUploaded.Put(s.ctx, fs.ObjectPair{Src: x, Dst: nil}) ok := s.toBeUploaded.Put(s.inCtx, fs.ObjectPair{Src: x, Dst: nil})
if !ok { if !ok {
return return
} }
@ -1065,7 +1065,7 @@ func (s *syncCopyMove) Match(ctx context.Context, dst, src fs.DirEntry) (recurse
} }
dstX, ok := dst.(fs.Object) dstX, ok := dst.(fs.Object)
if ok { if ok {
ok = s.toBeChecked.Put(s.ctx, fs.ObjectPair{Src: srcX, Dst: dstX}) ok = s.toBeChecked.Put(s.inCtx, fs.ObjectPair{Src: srcX, Dst: dstX})
if !ok { if !ok {
return false return false
} }