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

remove debug print

Browse source
This commit is contained in:
Joey Hess 2019-03-07 16:06:54 -04:00
parent e3a704224f
commit ee5f1422df
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Remote/Helper/ExportImport.hs
View file

@ -154,7 +154,6 @@ adjustExportImport r = case M.lookup "exporttree" (config r) of
oldks <- liftIO $ Export.getExportTreeKey exportdb loc oldks <- liftIO $ Export.getExportTreeKey exportdb loc
oldcids <- liftIO $ concat oldcids <- liftIO $ concat
<$> mapM (ContentIdentifier.getContentIdentifiers db (uuid r')) oldks <$> mapM (ContentIdentifier.getContentIdentifiers db (uuid r')) oldks
liftIO $ print ("cids", oldcids)
storeExportWithContentIdentifier (importActions r') f k loc oldcids p >>= \case storeExportWithContentIdentifier (importActions r') f k loc oldcids p >>= \case
Nothing -> return False Nothing -> return False
Just newcid -> do Just newcid -> do

18
doc/todo/import_tree.mdwn
View file

@ -10,24 +10,6 @@ this.
## implementation notes ## implementation notes
* updateExportTreeFromLog deadlocks when running git-annex export because
it locks the export db first.
Could switch to fine-grained locking, but Command.Export would need to
lock and flush writes to the database many times, and that may be too
expensive.
How about this: Make an action that waits to lock the export db and
runs updateExportTreeFromLog. While the update is running take an
exclusive lock on an update lock file. Only lock the database using that,
in Command.Export etc.
Then, in ExportImport, it only has to try to run that action;
if the action fails due to the lock being held by the same or another
process, it suffices to take a shared lock of the update lock file
(and immediately release it), in order to wait for the update to
complete.
* Need to support annex-tracking-branch configuration, which documentation * Need to support annex-tracking-branch configuration, which documentation
says makes git-annex sync and assistant do imports. says makes git-annex sync and assistant do imports.