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

init: When annex.pidlock is set, skip lock probing.

Browse source
This commit is contained in:
Joey Hess 2020-06-05 11:12:16 -04:00
parent 1d41ae5d2a
commit 2bff3b7c49
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Annex/Init.hs
View file

@ -264,7 +264,9 @@ probeFifoSupport = do
#endif
checkLockSupport :: Annex ()
checkLockSupport = unlessM probeLockSupport $ do
checkLockSupport =
unlessM (annexPidLock <$> Annex.getGitConfig) $
unlessM probeLockSupport $ do
warning "Detected a filesystem without POSIX fcntl lock support."
warning "Enabling annex.pidlock."
setConfig (annexConfig "pidlock") (Git.Config.boolConfig True)

1
CHANGELOG
View file

@ -24,6 +24,7 @@ git-annex (8.20200523) UNRELEASED; urgency=medium
cleanup actions in separate job pool from uploads.
* init: If lock probing stalls for a long time (eg a broken NFS server),
display a message to let the user know what's taking so long.
* init: When annex.pidlock is set, skip lock probing.
-- Joey Hess <id@joeyh.name> Tue, 26 May 2020 10:20:52 -0400

3
doc/todo/faster___40__took_2_min__41___way_to_realize_the_need_in_pidlock__63__.mdwn
View file

@ -214,3 +214,6 @@ At least adding some debug message before running the detection could be of help
[[!meta author=yoh]]
[[!tag projects/datalad]]
> what I mentioned in the comments is [[done]] --[[Joey]]

7
doc/todo/faster___40__took_2_min__41___way_to_realize_the_need_in_pidlock__63__/comment_3_26f82b5ef0ce9dc0a5a8fc64f4a3b335._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="joey"
subject="""comment 3"""
date="2020-06-05T15:11:44Z"
content="""
Is this related to your other bug about something seeming to hang/stall?
"""]]