34c8af74ba
I've been disliking how the command seek actions were written for some time, with their inversion of control and ugly workarounds. The last straw to fix it was sync --content, which didn't fit the Annex [CommandStart] interface well at all. I have not yet made it take advantage of the changed interface though. The crucial change, and probably why I didn't do it this way from the beginning, is to make each CommandStart action be run with exceptions caught, and if it fails, increment a failure counter in annex state. So I finally remove the very first code I wrote for git-annex, which was before I had exception handling in the Annex monad, and so ran outside that monad, passing state explicitly as it ran each CommandStart action. This was a real slog from 1 to 5 am. Test suite passes. Memory usage is lower than before, sometimes by a couple of megabytes, and remains constant, even when running in a large repo, and even when repeatedly failing and incrementing the error counter. So no accidental laziness space leaks. Wall clock speed is identical, even in large repos. This commit was sponsored by an anonymous bitcoiner.
89 lines
2.4 KiB
Haskell
89 lines
2.4 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2010 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.RecvKey where
|
|
|
|
import System.PosixCompat.Files
|
|
|
|
import Common.Annex
|
|
import Command
|
|
import CmdLine
|
|
import Annex.Content
|
|
import Annex
|
|
import Utility.Rsync
|
|
import Logs.Transfer
|
|
import Command.SendKey (fieldTransfer)
|
|
import qualified Fields
|
|
import qualified Types.Key
|
|
import qualified Types.Backend
|
|
import qualified Backend
|
|
|
|
def :: [Command]
|
|
def = [noCommit $ command "recvkey" paramKey seek
|
|
SectionPlumbing "runs rsync in server mode to receive content"]
|
|
|
|
seek :: CommandSeek
|
|
seek = withKeys start
|
|
|
|
start :: Key -> CommandStart
|
|
start key = ifM (inAnnex key)
|
|
( error "key is already present in annex"
|
|
, fieldTransfer Download key $ \_p ->
|
|
ifM (getViaTmp key go)
|
|
( do
|
|
-- forcibly quit after receiving one key,
|
|
-- and shutdown cleanly
|
|
_ <- shutdown True
|
|
return True
|
|
, return False
|
|
)
|
|
)
|
|
where
|
|
go tmp = do
|
|
opts <- filterRsyncSafeOptions . maybe [] words
|
|
<$> getField "RsyncOptions"
|
|
ok <- liftIO $ rsyncServerReceive (map Param opts) tmp
|
|
|
|
-- The file could have been received with permissions that
|
|
-- do not allow reading it, so this is done before the
|
|
-- directcheck.
|
|
freezeContent tmp
|
|
|
|
if ok
|
|
then ifM (isJust <$> Fields.getField Fields.direct)
|
|
( directcheck tmp
|
|
, return True
|
|
)
|
|
else return False
|
|
{- If the sending repository uses direct mode, the file
|
|
- it sends could be modified as it's sending it. So check
|
|
- that the right size file was received, and that the key/value
|
|
- Backend is happy with it. -}
|
|
directcheck tmp = do
|
|
oksize <- case Types.Key.keySize key of
|
|
Nothing -> return True
|
|
Just size -> do
|
|
size' <- fromIntegral . fileSize
|
|
<$> liftIO (getFileStatus tmp)
|
|
return $ size == size'
|
|
if oksize
|
|
then case Backend.maybeLookupBackendName (Types.Key.keyBackendName key) of
|
|
Nothing -> do
|
|
warning "recvkey: received key from direct mode repository using unknown backend; cannot check; discarding"
|
|
return False
|
|
Just backend -> maybe (return True) runfsck
|
|
(Types.Backend.fsckKey backend)
|
|
else do
|
|
warning "recvkey: received key with wrong size; discarding"
|
|
return False
|
|
where
|
|
runfsck check = ifM (check key tmp)
|
|
( return True
|
|
, do
|
|
warning "recvkey: received key from direct mode repository seems to have changed as it was transferred; discarding"
|
|
return False
|
|
)
|