jgaunt/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-12-31 07:33:33 +00:00
Code Issues Projects Releases Wiki Activity

sync: fix incorrect error reported by graceful cutoff - fixes #5203

Browse Source 
Before this change, a sync which was finished with a graceful transfer
cutoff could return "context canceled" instead of the correct error.

This fixes the problem by ignoring "context canceled" errors if we
have done a graceful stop.
This commit is contained in:
Nick Craig-Wood
2021-04-06 12:59:36 +01:00
parent dc286529bc
commit 54771e4402
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/sync/sync.go
View File

@@ -266,6 +266,9 @@ func (s *syncCopyMove) processError(err error) {
// Cancel the march and stop the pipes // Cancel the march and stop the pipes
s.inCancel() s.inCancel()
} }
} else if err == context.Canceled && s.inCtx.Err() != nil {
// Ignore context Canceled if we have called s.inCancel()
return
} }
s.errorMu.Lock() s.errorMu.Lock()
defer s.errorMu.Unlock() defer s.errorMu.Unlock()