mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Retry transfers to exporttree=yes remotes same as for other remotes

Browse source 
The comment about noRetry is not well-justified, because transfers to many
remotes cannot be resumed, but retries are still allowed for those.
This commit is contained in:
Joey Hess 2020-09-04 13:23:33 -04:00
parent 1a42b2c5a3
commit 46eb48d7c0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -27,6 +27,7 @@ git-annex (8.20200815) UNRELEASED; urgency=medium
* Limit retrying of failed transfers when forward progress is being made * Limit retrying of failed transfers when forward progress is being made
to 5, to avoid some unusual edge cases where too much retrying could to 5, to avoid some unusual edge cases where too much retrying could
result in far more data transfer than makes sense. result in far more data transfer than makes sense.
* Retry transfers to exporttree=yes remotes same as for other remotes.
-- Joey Hess <id@joeyh.name> Fri, 14 Aug 2020 14:57:45 -0400 -- Joey Hess <id@joeyh.name> Fri, 14 Aug 2020 14:57:45 -0400

4
Command/Export.hs
View file

@ -281,9 +281,7 @@ performExport r db ek af contentsha loc allfilledvar = do
sent <- tryNonAsync $ case ek of sent <- tryNonAsync $ case ek of
AnnexKey k -> ifM (inAnnex k) AnnexKey k -> ifM (inAnnex k)
( notifyTransfer Upload af $ ( notifyTransfer Upload af $
-- Using noRetry here because interrupted upload (uuid r) k af stdRetry $ \pm -> do
-- exports cannot be resumed.
upload (uuid r) k af noRetry $ \pm -> do
let rollback = void $ let rollback = void $
performUnexport r db [ek] loc performUnexport r db [ek] loc
sendAnnex k rollback $ \f -> sendAnnex k rollback $ \f ->

2
doc/todo/tolerate_intermittent_errors_upon___34__export__34_____40__and_probably_copy__41___to_S3.mdwn
View file

@ -4,3 +4,5 @@ If git-annex already does that, please pardon my noise and close this TODO.
[[!meta author=yoh]] [[!meta author=yoh]]
[[!tag projects/datalad]] [[!tag projects/datalad]]
[[fixed|done]] --[[Joey]]

8
doc/todo/tolerate_intermittent_errors_upon___34__export__34_____40__and_probably_copy__41___to_S3/comment_2_6b655d30bf07518f33ec42cdeabef4ef._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2020-09-04T17:00:11Z"
content="""
What about the other side of export, import? Looks to me that does not
retry either.
"""]]