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

assistant: when an add fails, requeue it for later

Browse source 
See analysis in bug report for one way this could happen.
This commit is contained in:
Joey Hess 2013-04-23 18:23:04 -04:00
parent 53674cc3fd
commit ca72b1ac7b
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Assistant/Threads/Committer.hs
View file

@ -256,14 +256,14 @@ handleAdds delayadd cs = returnWhen (null incomplete) $ do
| otherwise = a | otherwise = a
add :: Change -> Assistant (Maybe Change) add :: Change -> Assistant (Maybe Change)
add change@(InProcessAddChange { keySource = ks }) = do add change@(InProcessAddChange { keySource = ks }) =
alertWhile' (addFileAlert $ keyFilename ks) $ alertWhile' (addFileAlert $ keyFilename ks) $
liftM ret $ catchMaybeIO <~> do liftM ret $ catchMaybeIO <~> do
sanitycheck ks $ do sanitycheck ks $ do
key <- liftAnnex $ do key <- liftAnnex $ do
showStart "add" $ keyFilename ks showStart "add" $ keyFilename ks
Command.Add.ingest $ Just ks Command.Add.ingest $ Just ks
maybe failedingest (done change $ keyFilename ks) key maybe (failedingest change) (done change $ keyFilename ks) key
where where
{- Add errors tend to be transient and will be automatically {- Add errors tend to be transient and will be automatically
- dealt with, so don't pass to the alert code. -} - dealt with, so don't pass to the alert code. -}
@ -306,7 +306,8 @@ handleAdds delayadd cs = returnWhen (null incomplete) $ do
mkpairs k = map (\c -> (inodeCacheToKey ct c, k)) <$> mkpairs k = map (\c -> (inodeCacheToKey ct c, k)) <$>
recordedInodeCache k recordedInodeCache k
failedingest = do failedingest change = do
refill [change]
liftAnnex showEndFail liftAnnex showEndFail
return Nothing return Nothing

22
doc/bugs/assistant_does_not_warn_on_files_it_failed_to_add.mdwn
View file

@ -22,3 +22,25 @@ OS: Arch Linux
Please provide any additional information below. Please provide any additional information below.
The assistant in this case is being used as nothing more than a way for me to see which files have been added (--verbose, --foreground and --debug with 'watch' outputs nothing..). No remotes or anything like that. The assistant in this case is being used as nothing more than a way for me to see which files have been added (--verbose, --foreground and --debug with 'watch' outputs nothing..). No remotes or anything like that.
> I have made the assistant re-queue any file that it fails to add,
> so it will retry it later. Typically within a few seconds. [[done]]
>
> I have only been able to think of one scenario in which this could
> happen. It's pretty unusual:
>
> * Something writes to a file, and closes it.
> * Assistant sees file has no writers, and locks it down in preparation
> to add it.
> * Something then re-opens the file to write to it some more.
> Note that it would seem to need to bypass permissions that prevent
> the file from being written to in order to do this. It makes a change
> to the file.
> * Assistant is checksumming file, reaches end, and detects it has been
> tampered with and gives up.
>
> I would still like more information about circumstances that
> cause this to happen, because while a possible scenario, the
> above is too weird to believe anyone could run into it.
>
> --[[Joey]]