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

remove reapZombies

Browse source 
Believed to be no longer needed as I've squashed the last ones.

Note that, in Test.Framework, I can see no reason for the code to have
run it twice. It does not cause running processes to exit after all,
so any process that has leaked and is running and causing problems with
cleanup of the directory won't be helped by running it.

This commit was sponsored by Mark Reidenbach on Patreon.
This commit is contained in:
Joey Hess 2020-09-25 11:47:34 -04:00
parent f624876dc2
commit 3e577a6dd3
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 1 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Test/Framework.hs
View file

@ -245,15 +245,13 @@ cleanup dir = whenM (doesDirectoryExist dir) $ do
finalCleanup :: IO ()
finalCleanup = whenM (doesDirectoryExist tmpdir) $ do
Annex.Action.reapZombies
Command.Uninit.prepareRemoveAnnexDir' tmpdir
catchIO (removeDirectoryForCleanup tmpdir) $ \e -> do
print e
putStrLn "sleeping 10 seconds and will retry directory cleanup"
Utility.ThreadScheduler.threadDelaySeconds $
Utility.ThreadScheduler.Seconds 10
whenM (doesDirectoryExist tmpdir) $ do
Annex.Action.reapZombies
whenM (doesDirectoryExist tmpdir) $
removeDirectoryForCleanup tmpdir
checklink :: FilePath -> Assertion