diff options
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Action.hs | 2 | ||||
| -rw-r--r-- | Annex/Content.hs | 22 |
2 files changed, 17 insertions, 7 deletions
diff --git a/Annex/Action.hs b/Annex/Action.hs index f59c9c2f4..348487e7c 100644 --- a/Annex/Action.hs +++ b/Annex/Action.hs @@ -17,6 +17,7 @@ import System.Posix.Signals import Common.Annex import qualified Annex import Annex.Content +import qualified Database.Keys {- Actions to perform each time ran. -} startup :: Annex () @@ -32,4 +33,5 @@ shutdown :: Bool -> Annex () shutdown nocommit = do saveState nocommit sequence_ =<< M.elems <$> Annex.getState Annex.cleanup + Database.Keys.shutdown liftIO reapZombies -- zombies from long-running git processes diff --git a/Annex/Content.hs b/Annex/Content.hs index a530245b3..e635b97a3 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -451,7 +451,9 @@ moveAnnex key src = withObjectLoc key storeobject storedirect fs <- Database.Keys.getAssociatedFiles key if null fs then freezeContent dest - else mapM_ (populatePointerFile key dest) fs + else do + mapM_ (populatePointerFile key dest) fs + Database.Keys.storeInodeCaches key (dest:fs) ) storeindirect = storeobject =<< calcRepo (gitAnnexLocation key) @@ -505,7 +507,9 @@ linkAnnex key src = do ( return LinkAnnexNoop , modifyContent dest $ ifM (liftIO $ createLinkOrCopy src dest) - ( return LinkAnnexOk + ( do + Database.Keys.storeInodeCaches key [dest, src] + return LinkAnnexOk , return LinkAnnexFailed ) ) @@ -601,6 +605,7 @@ removeAnnex (ContentRemovalLock key) = withObjectLoc key remove removedirect removeInodeCache key mapM_ (void . tryIO . resetPointerFile key) =<< Database.Keys.getAssociatedFiles key + Database.Keys.removeInodeCaches key removedirect fs = do cache <- recordedInodeCache key removeInodeCache key @@ -613,8 +618,7 @@ removeAnnex (ContentRemovalLock key) = withObjectLoc key remove removedirect {- To safely reset a pointer file, it has to be 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. - -} + - file. -} resetPointerFile :: Key -> FilePath -> Annex () resetPointerFile key f = go =<< geti where @@ -624,10 +628,14 @@ resetPointerFile key f = go =<< geti secureErase f liftIO $ nukeFile f liftIO $ writeFile f (formatPointer key) - , noop + -- Can't delete the pointer file. + -- If it was a hard link to the annex object, + -- that object might have been frozen as part of the + -- removal process, so thaw it. + , thawContent f ) - cheapcheck fc = maybe (return False) (compareInodeCaches fc) - =<< Database.Keys.getInodeCache key + cheapcheck fc = anyM (compareInodeCaches fc) + =<< Database.Keys.getInodeCaches key expensivecheck fc = ifM (verifyKeyContent AlwaysVerify Types.Remote.UnVerified key f) -- The file could have been modified while it was -- being verified. Detect that. |