diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-13 12:36:37 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-13 12:36:37 -0400 |
| commit | 4799572544e8d02940eb4397c2162428d04853ee (patch) | |
| tree | 6d097d84c6608c8879a0cdb375aed6fe9f16c819 | |
| parent | 1d5f68b1c46fe309005768a2c1cc44de29e56c1a (diff) | |
better lock dropping order
| -rw-r--r-- | Utility/LockFile/PidLock.hs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Utility/LockFile/PidLock.hs b/Utility/LockFile/PidLock.hs index ac1df253d..94c70e714 100644 --- a/Utility/LockFile/PidLock.hs +++ b/Utility/LockFile/PidLock.hs @@ -20,7 +20,6 @@ import Utility.PartialPrelude import Utility.Exception import Utility.Applicative import Utility.Directory -import Utility.ThreadScheduler import Utility.Monad import Utility.Path import Utility.FileMode @@ -127,10 +126,14 @@ waitLock (Seconds timeout) lockfile = go timeout error $ "Gave up waiting for possibly stale pid lock file " ++ lockfile dropLock :: LockHandle -> IO () -dropLock (LockHandle lockfile fd plh) = do +dropLock (LockHandle lockfile fd sidelock) = do + -- Drop side lock first, at which point the pid lock will be + -- considered stale. + -- The side lock file cannot be deleted because another process may + -- have it open and be waiting to lock it. + maybe noop Posix.dropLock sidelock closeFd fd nukeFile lockfile - maybe noop Posix.dropLock plh getLockStatus :: LockFile -> IO LockStatus getLockStatus = maybe StatusUnLocked (StatusLockedBy . lockingPid) <$$> readPidLock |