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

avoid updating tracking branch when transfer to export throws exception

Browse source
This commit is contained in:
Joey Hess 2019-03-05 16:49:42 -04:00
parent dc278c059c
commit 5767b1b00d
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Command/Export.hs
View file

@ -258,7 +258,7 @@ startExport r db cvar allfilledvar ti = do
performExport :: Remote -> ExportHandle -> ExportKey -> AssociatedFile -> Sha -> ExportLocation -> MVar AllFilled -> CommandPerform performExport :: Remote -> ExportHandle -> ExportKey -> AssociatedFile -> Sha -> ExportLocation -> MVar AllFilled -> CommandPerform
performExport r db ek af contentsha loc allfilledvar = do performExport r db ek af contentsha loc allfilledvar = do
let storer = storeExport (exportActions r) let storer = storeExport (exportActions r)
sent <- 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 -- Using noRetry here because interrupted
@ -279,11 +279,15 @@ performExport r db ek af contentsha loc allfilledvar = do
liftIO $ L.hPut h b liftIO $ L.hPut h b
liftIO $ hClose h liftIO $ hClose h
storer tmp sha1k loc nullMeterUpdate storer tmp sha1k loc nullMeterUpdate
if sent let failedsend = liftIO $ modifyMVar_ allfilledvar (pure . const (AllFilled False))
then next $ cleanupExport r db ek loc True case sent of
else do Right True -> next $ cleanupExport r db ek loc True
liftIO $ modifyMVar_ allfilledvar (pure . const (AllFilled False)) Right False -> do
failedsend
stop stop
Left err -> do
failedsend
throwM err
cleanupExport :: Remote -> ExportHandle -> ExportKey -> ExportLocation -> Bool -> CommandCleanup cleanupExport :: Remote -> ExportHandle -> ExportKey -> ExportLocation -> Bool -> CommandCleanup
cleanupExport r db ek loc sent = do cleanupExport r db ek loc sent = do

2
doc/todo/import_tree.mdwn
View file

@ -10,8 +10,6 @@ this.
## implementation notes ## implementation notes
* tracking branch is updated after a failed export, should not be
* getknowncids should run "updateexportdb exportdb exportdbv", * getknowncids should run "updateexportdb exportdb exportdbv",
but that leads to a STM deadlock for some reason? but that leads to a STM deadlock for some reason?