478ed28f98
This reverts windows-specific parts of 5a98f2d509
There were no code paths in common between windows and unix, so this
will return Windows to the old behavior.
The problem that the commit talks about has to do with multiple different
locations where git-annex can store annex object files, but that is not
too relevant to Windows anyway, because on windows the filesystem is always
treated as criplled and/or symlinks are not supported, so it will only
use one object location. It would need to be using a repo populated
in another OS to have the other object location in use probably.
Then a drop and get could possibly lead to a dangling lock file.
And, I was not able to actually reproduce that situation happening
before making that commit, even when I forced a race. So making these
changes on windows was just begging trouble..
I suspect that the change that caused the reversion is in
Annex/Content/Presence.hs. It checks if the content file exists,
and then called modifyContentDirWhenExists, which seems like it would
not fail, but if something deleted the content file at that point,
that call would fail. Which would result in an exception being thrown,
which should not normally happen from a call to inAnnexSafe. That was a
windows-specific change; the unix side did not have an equivilant
change.
Sponsored-by: Dartmouth College's Datalad project
214 lines
7 KiB
Haskell
214 lines
7 KiB
Haskell
{- git-annex object content presence
|
|
-
|
|
- Copyright 2010-2022 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
{-# LANGUAGE CPP #-}
|
|
{-# LANGUAGE OverloadedStrings #-}
|
|
|
|
module Annex.Content.Presence (
|
|
inAnnex,
|
|
inAnnex',
|
|
inAnnexSafe,
|
|
inAnnexCheck,
|
|
objectFileExists,
|
|
withObjectLoc,
|
|
isUnmodified,
|
|
isUnmodified',
|
|
isUnmodifiedCheap,
|
|
withContentLockFile,
|
|
contentLockFile,
|
|
) where
|
|
|
|
import Annex.Content.Presence.LowLevel
|
|
import Annex.Common
|
|
import qualified Annex
|
|
import Annex.LockPool
|
|
import Annex.LockFile
|
|
import Annex.Version
|
|
import Types.RepoVersion
|
|
import qualified Database.Keys
|
|
import Annex.InodeSentinal
|
|
import Utility.InodeCache
|
|
import qualified Utility.RawFilePath as R
|
|
import qualified Git
|
|
import Config
|
|
|
|
#ifdef mingw32_HOST_OS
|
|
import Annex.Perms
|
|
#endif
|
|
|
|
import qualified System.FilePath.ByteString as P
|
|
|
|
{- Checks if a given key's content is currently present. -}
|
|
inAnnex :: Key -> Annex Bool
|
|
inAnnex key = inAnnexCheck key $ liftIO . R.doesPathExist
|
|
|
|
{- Runs an arbitrary check on a key's content. -}
|
|
inAnnexCheck :: Key -> (RawFilePath -> Annex Bool) -> Annex Bool
|
|
inAnnexCheck key check = inAnnex' id False check key
|
|
|
|
{- inAnnex that performs an arbitrary check of the key's content. -}
|
|
inAnnex' :: (a -> Bool) -> a -> (RawFilePath -> Annex a) -> Key -> Annex a
|
|
inAnnex' isgood bad check key = withObjectLoc key $ \loc -> do
|
|
r <- check loc
|
|
if isgood r
|
|
then ifM (annexThin <$> Annex.getGitConfig)
|
|
-- When annex.thin is set, the object file
|
|
-- could be modified; make sure it's not.
|
|
-- (Suppress any messages about
|
|
-- checksumming, to avoid them cluttering
|
|
-- the display.)
|
|
( ifM (doQuietAction $ isUnmodified key loc)
|
|
( return r
|
|
, return bad
|
|
)
|
|
, return r
|
|
)
|
|
else return bad
|
|
|
|
{- Like inAnnex, checks if the object file for a key exists,
|
|
- but there are no guarantees it has the right content. -}
|
|
objectFileExists :: Key -> Annex Bool
|
|
objectFileExists key =
|
|
calcRepo (gitAnnexLocation key)
|
|
>>= liftIO . R.doesPathExist
|
|
|
|
{- A safer check; the key's content must not only be present, but
|
|
- is not in the process of being removed. -}
|
|
inAnnexSafe :: Key -> Annex (Maybe Bool)
|
|
inAnnexSafe key = inAnnex' (fromMaybe True) (Just False) go key
|
|
where
|
|
is_locked = Nothing
|
|
is_unlocked = Just True
|
|
is_missing = Just False
|
|
|
|
go contentfile = withContentLockFile key $ flip checklock contentfile
|
|
|
|
#ifndef mingw32_HOST_OS
|
|
checklock Nothing contentfile = checkOr is_missing contentfile
|
|
{- The content file must exist, but the lock file generally
|
|
- won't exist unless a removal is in process. -}
|
|
checklock (Just lockfile) contentfile =
|
|
ifM (liftIO $ doesFileExist (fromRawFilePath contentfile))
|
|
( checkOr is_unlocked lockfile
|
|
, return is_missing
|
|
)
|
|
checkOr d lockfile = checkLocked lockfile >>= return . \case
|
|
Nothing -> d
|
|
Just True -> is_locked
|
|
Just False -> is_unlocked
|
|
#else
|
|
checklock Nothing contentfile = liftIO $ ifM (doesFileExist (fromRawFilePath contentfile))
|
|
( lockShared contentfile >>= \case
|
|
Nothing -> return is_locked
|
|
Just lockhandle -> do
|
|
dropLock lockhandle
|
|
return is_unlocked
|
|
, return is_missing
|
|
)
|
|
{- In Windows, see if we can take a shared lock. If so,
|
|
- remove the lock file to clean up after ourselves. -}
|
|
checklock (Just lockfile) contentfile =
|
|
ifM (liftIO $ doesFileExist (fromRawFilePath contentfile))
|
|
( modifyContentDir lockfile $ liftIO $
|
|
lockShared lockfile >>= \case
|
|
Nothing -> return is_locked
|
|
Just lockhandle -> do
|
|
dropLock lockhandle
|
|
void $ tryIO $ removeWhenExistsWith R.removeLink lockfile
|
|
return is_unlocked
|
|
, return is_missing
|
|
)
|
|
#endif
|
|
|
|
{- Runs an action with the lock file to use to lock a key's content.
|
|
- When the content file itself should be locked, runs the action with
|
|
- Nothing.
|
|
-
|
|
- In v9 and below, while the action is running, a shared lock is held of the
|
|
- gitAnnexContentLockLock. That prevents the v10 upgrade, which changes how
|
|
- content locking works, from running at the same time as content is locked
|
|
- using the old method.
|
|
-}
|
|
withContentLockFile :: Key -> (Maybe RawFilePath -> Annex a) -> Annex a
|
|
withContentLockFile k a = do
|
|
v <- getVersion
|
|
if versionNeedsWritableContentFiles v
|
|
then withSharedLock gitAnnexContentLockLock $ do
|
|
{- While the lock is held, check to see if the git
|
|
- config has changed, and reload it if so. This
|
|
- updates the annex.version after the v10 upgrade,
|
|
- so that a process that started in a v9 repository
|
|
- will switch over to v10 content lock files at the
|
|
- right time. -}
|
|
gitdir <- fromRepo Git.localGitDir
|
|
let gitconfig = gitdir P.</> "config"
|
|
ic <- withTSDelta (liftIO . genInodeCache gitconfig)
|
|
oldic <- Annex.getState Annex.gitconfiginodecache
|
|
v' <- if fromMaybe False (compareStrong <$> ic <*> oldic)
|
|
then pure v
|
|
else do
|
|
Annex.changeState $ \s ->
|
|
s { Annex.gitconfiginodecache = ic }
|
|
reloadConfig
|
|
getVersion
|
|
go (v')
|
|
else (go v)
|
|
where
|
|
go v = contentLockFile k v >>= a
|
|
|
|
contentLockFile :: Key -> Maybe RepoVersion -> Annex (Maybe RawFilePath)
|
|
#ifndef mingw32_HOST_OS
|
|
{- Older versions of git-annex locked content files themselves, but newer
|
|
- versions use a separate lock file, to better support repos shared
|
|
- amoung users in eg a group. -}
|
|
contentLockFile key v
|
|
| versionNeedsWritableContentFiles v = pure Nothing
|
|
| otherwise = Just <$> calcRepo (gitAnnexContentLock key)
|
|
#else
|
|
{- Windows always has to use a separate lock file from the content, since
|
|
- locking the actual content file would interfere with the user's
|
|
- use of it. -}
|
|
contentLockFile key _ = Just <$> calcRepo (gitAnnexContentLock key)
|
|
#endif
|
|
|
|
{- Performs an action, passing it the location to use for a key's content. -}
|
|
withObjectLoc :: Key -> (RawFilePath -> Annex a) -> Annex a
|
|
withObjectLoc key a = a =<< calcRepo (gitAnnexLocation key)
|
|
|
|
{- Check if a file contains the unmodified content of the key.
|
|
-
|
|
- The expensive way to tell is to do a verification of its content.
|
|
- The cheaper way is to see if the InodeCache for the key matches the
|
|
- file. -}
|
|
isUnmodified :: Key -> RawFilePath -> Annex Bool
|
|
isUnmodified key f =
|
|
withTSDelta (liftIO . genInodeCache f) >>= \case
|
|
Just fc -> do
|
|
ic <- Database.Keys.getInodeCaches key
|
|
isUnmodified' key f fc ic
|
|
Nothing -> return False
|
|
|
|
isUnmodified' :: Key -> RawFilePath -> InodeCache -> [InodeCache] -> Annex Bool
|
|
isUnmodified' = isUnmodifiedLowLevel Database.Keys.addInodeCaches
|
|
|
|
{- Cheap check if a file contains the unmodified content of the key,
|
|
- only checking the InodeCache of the key.
|
|
-
|
|
- When the InodeCache is stale, this may incorrectly report that a file is
|
|
- modified.
|
|
-
|
|
- Note that, on systems not supporting high-resolution mtimes,
|
|
- this may report a false positive when repeated edits are made to a file
|
|
- within a small time window (eg 1 second).
|
|
-}
|
|
isUnmodifiedCheap :: Key -> RawFilePath -> Annex Bool
|
|
isUnmodifiedCheap key f = maybe (return False) (isUnmodifiedCheap' key)
|
|
=<< withTSDelta (liftIO . genInodeCache f)
|
|
|
|
isUnmodifiedCheap' :: Key -> InodeCache -> Annex Bool
|
|
isUnmodifiedCheap' key fc = isUnmodifiedCheapLowLevel fc
|
|
=<< Database.Keys.getInodeCaches key
|