1
mirror of https://github.com/rclone/rclone synced 2024-07-21 08:54:12 +02:00

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

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

View File

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