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

Run annex.thawcontent-command before deleting an object file

Browse source 
In case annex.freezecontent-command did something that would prevent
deletion.

Sponsored-by: Dartmouth College's Datalad project
This commit is contained in:
Joey Hess 2022-02-24 14:10:53 -04:00
parent 346007a915
commit f4b046252a
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 70 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Annex/Content.hs
View file

@ -598,6 +598,14 @@ cleanObjectLoc :: Key -> Annex () -> Annex ()
cleanObjectLoc key cleaner = do
file <- calcRepo (gitAnnexLocation key)
void $ tryIO $ thawContentDir file
{- Thawing is not necessary when the file was frozen only
- by removing write perms. But if there is a thaw hook, it may do
- something else that is necessary to allow the file to be
- deleted.
-}
whenM hasThawHook $
void $ tryIO $ thawContent file
cleaner
liftIO $ cleanObjectDirs file

4
Annex/Perms.hs
View file

@ -29,6 +29,7 @@ module Annex.Perms (
modifyContent,
withShared,
hasFreezeHook,
hasThawHook,
) where
import Annex.Common
@ -301,6 +302,9 @@ modifyContent f a = do
hasFreezeHook :: Annex Bool
hasFreezeHook = isJust . annexFreezeContentCommand <$> Annex.getGitConfig
hasThawHook :: Annex Bool
hasThawHook = isJust . annexThawContentCommand <$> Annex.getGitConfig
freezeHook :: RawFilePath -> Annex ()
freezeHook p = maybe noop go =<< annexFreezeContentCommand <$> Annex.getGitConfig
where

3
CHANGELOG
View file

@ -9,6 +9,9 @@ git-annex (10.20220223) UNRELEASED; urgency=medium
* When annex.freezecontent-command is set, and the filesystem does not
support removing write bits, avoid treating it as a crippled
filesystem.
* Run annex.thawcontent-command before deleting an object file,
in case annex.freezecontent-command did something that would prevent
deletion.
-- Joey Hess <id@joeyh.name> Wed, 23 Feb 2022 14:14:09 -0400

55
doc/bugs/can__39__t_make_annex_happy_in_freeze__47__thaw/comment_6_e12bd42ef9690d3bb74236d55da66bff._comment Normal file
View file

@ -0,0 +1,55 @@
[[!comment format=mdwn
username="joey"
subject="""comment 6"""
date="2022-02-24T17:30:07Z"
content="""
I've added --debug output for both freezing and thawing.
The behavior will vary between v8 and v10 because of changes to locking; in v8
it has to thaw the content file before it can lock it, and then it will freeze
it back after locking and before removing it.
In v8 drop looks like:
[2022-02-24 13:51:01.946411104] (Annex.Perms) thawing content .git/annex/objects/p9/5Q/SHA256E-s30--afdc07f1ee36cca8648193709de3a8bbd7abf1ce9ff23538284d01dee4d9cf63/SHA256E-s30--afdc07f1ee36cca8648193709de3a8bbd7abf1ce9ff23538284d01dee4d9cf63
[2022-02-24 13:51:01.947501102] (Annex.Perms) freezing content .git/annex/objects/p9/5Q/SHA256E-s30--afdc07f1ee36cca8648193709de3a8bbd7abf1ce9ff23538284d01dee4d9cf63/SHA256E-s30--afdc07f1ee36cca8648193709de3a8bbd7abf1ce9ff23538284d01dee4d9cf63
[2022-02-24 13:51:01.966185222] (Annex.Perms) thawing content directory .git/annex/objects/p9/5Q/SHA256E-s30--afdc07f1ee36cca8648193709de3a8bbd7abf1ce9ff23538284d01dee4d9cf63
[2022-02-24 13:51:01.967659691] (Annex.Perms) thawing content ./foo
In v10 drop looks like:
[2022-02-24 13:50:11.863585194] (Annex.Perms) freezing content directory .git/annex/objects/p9/5Q/SHA256E-s30--afdc07f1ee36cca8648193709de3a8bbd7abf1ce9ff23538284d01dee4d9cf63
[2022-02-24 13:50:11.883859034] (Annex.Perms) thawing content directory .git/annex/objects/p9/5Q/SHA256E-s30--afdc07f1ee36cca8648193709de3a8bbd7abf1ce9ff23538284d01dee4d9cf63
[2022-02-24 13:50:11.885644532] (Annex.Perms) thawing content ./foo
[2022-02-24 13:50:11.887090539] (Annex.Perms) thawing content directory .git/annex/objects/p9/5Q/SHA256E-s30--afdc07f1ee36cca8648193709de3a8bbd7abf1ce9ff23538284d01dee4d9cf63
So that's more or less as I expected (aside from the thawing of the worktree symlink foo
which is kind of weird).
You said "drop freezes thawn key file before thawing key dir" and yes, that's the v8 behavior
shown above.
The reason is safety: If it left the content file thawed after taking the posix
lock of it, but then turned out to be unable to remove it (could not lock
enough other copies of the object in other repos), it would then need to
re-freeze it since it failed to drop it. But waiting until that point to
re-freeze it would leave a perhaps long stretch of time where it was thawed and
vulnerable to being written to. And also if it were interrupted before it could
re-freeze it would leave it thawed until fsck finally noticed and fixed the
problem. So I don't feel what it's doing is wrong with respect to thawing
and then freezing in v8.
Notice that, in v10, it thaws the content directory, but never directly thaws
the content file. So if the content file remaining frozen prevents removing it,
that would also affect v10.
This does complicate freeze hooks that do things that prevent removal
of the file, rather than just preventing write to the file. Of course
those are two different permissions in classical unix permissions, but
not necessarily with your ACLs or with immutability bits etc.
So, I think that what git-annex ought to do is, when there's a thaw
hook, thaw the content file just before unlinking it.
Implemented that. Should solve your second problem.
"""]]