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

Fix data loss that can occur when annex.pidlock is set in a repository.

Browse source
This commit is contained in:
Joey Hess 2016-03-01 12:12:57 -04:00
parent 2f48c0aa7c
commit 3e91cd13ba
Failed to extract signature
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Annex/LockPool/PosixOrPid.hs
View file

@ -47,8 +47,14 @@ tryLockExclusive :: Maybe FileMode -> LockFile -> Annex (Maybe LockHandle)
tryLockExclusive m f = tryPidLock m f $ Posix.tryLockExclusive m f tryLockExclusive m f = tryPidLock m f $ Posix.tryLockExclusive m f
checkLocked :: LockFile -> Annex (Maybe Bool) checkLocked :: LockFile -> Annex (Maybe Bool)
checkLocked f = Posix.checkLocked f checkLocked f = Posix.checkLocked f `pidLockCheck` checkpid
`pidLockCheck` Pid.checkLocked where
checkpid pidlock = do
v <- Pid.checkLocked pidlock
case v of
-- Only return true when the posix lock file exists.
Just _ -> Posix.checkLocked f
Nothing -> return Nothing
getLockStatus :: LockFile -> Annex LockStatus getLockStatus :: LockFile -> Annex LockStatus
getLockStatus f = Posix.getLockStatus f getLockStatus f = Posix.getLockStatus f

1
debian/changelog vendored
View file

@ -1,6 +1,7 @@
git-annex (6.20160230) UNRELEASED; urgency=medium git-annex (6.20160230) UNRELEASED; urgency=medium
* metadata: Added -r to remove all current values of a field. * metadata: Added -r to remove all current values of a field.
* Fix data loss that can occur when annex.pidlock is set in a repository.
-- Joey Hess <id@joeyh.name> Mon, 29 Feb 2016 13:00:30 -0400 -- Joey Hess <id@joeyh.name> Mon, 29 Feb 2016 13:00:30 -0400

11
doc/bugs/thread_blocked_indefinitely_in_an_STM_transaction__while_moving_within__a_local_clone/comment_2_aa8c82f27965df44e69fd06b34be0ece._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2016-03-01T16:11:37Z"
content="""
A worse problem with annex.pidlock is that it completly broke checking
whether a key is present in the repository. That could lead to data loss
when eg, moving --to a repo with annex.pidlock set.
I've fixed that related bug.
"""]]