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

Bug fix: export with -J could fail when two files had the same content.

Browse source 
Exporting is done inside a call to writeLockDbWhile which guarantees there
is only one process uploading to a given ExportLocation.
This commit is contained in:
Joey Hess 2021-01-13 14:50:48 -04:00
parent fb921cd0b0
commit 6a30d04ece
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -24,6 +24,7 @@ git-annex (8.20201130) UNRELEASED; urgency=medium
include deletions of submodules. include deletions of submodules.
Thanks, Kyle Meyer for the patch. Thanks, Kyle Meyer for the patch.
* Windows: Work around win32 length limits when dealing with lock files. * Windows: Work around win32 length limits when dealing with lock files.
* Bug fix: export with -J could fail when two files had the same content.
-- Joey Hess <id@joeyh.name> Mon, 04 Jan 2021 12:52:41 -0400 -- Joey Hess <id@joeyh.name> Mon, 04 Jan 2021 12:52:41 -0400

6
Command/Export.hs
View file

@ -283,7 +283,11 @@ 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 $
upload' (uuid r) k af stdRetry $ \pm -> do -- alwaysUpload because the same key
-- could be used for more than one export
-- location, and concurrently uploading
-- of the content should still be allowed.
alwaysUpload (uuid r) k af stdRetry $ \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/bugs/export_-J_6__to_S3__58___transfer_already_in_progress.mdwn
View file

@ -94,3 +94,5 @@ Besides reporting the issue, I also have a question: could I just rerun `export
[[!meta author=yoh]] [[!meta author=yoh]]
[[!tag projects/datalad]] [[!tag projects/datalad]]
> [[fixed|done]] bypassed this unncessary locking for exports. --[[Joey]]