2010-11-02 23:04:24 +00:00
|
|
|
{- git-annex command
|
|
|
|
-
|
2022-06-09 19:26:25 +00:00
|
|
|
- Copyright 2010-2022 Joey Hess <id@joeyh.name>
|
2010-11-02 23:04:24 +00:00
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2010-11-02 23:04:24 +00:00
|
|
|
-}
|
|
|
|
|
2021-04-05 17:40:31 +00:00
|
|
|
{-# LANGUAGE OverloadedStrings #-}
|
|
|
|
|
2010-11-02 23:04:24 +00:00
|
|
|
module Command.Move where
|
|
|
|
|
|
|
|
import Command
|
2010-11-11 22:54:52 +00:00
|
|
|
import qualified Command.Drop
|
2010-11-02 23:04:24 +00:00
|
|
|
import qualified Annex
|
2011-10-04 04:40:47 +00:00
|
|
|
import Annex.Content
|
2011-03-27 21:24:20 +00:00
|
|
|
import qualified Remote
|
2011-10-15 21:47:03 +00:00
|
|
|
import Annex.UUID
|
2014-03-22 14:42:38 +00:00
|
|
|
import Annex.Transfer
|
2012-01-19 19:24:05 +00:00
|
|
|
import Logs.Presence
|
2018-04-13 18:06:25 +00:00
|
|
|
import Logs.Trust
|
2020-10-21 14:31:56 +00:00
|
|
|
import Logs.File
|
2015-10-09 20:16:03 +00:00
|
|
|
import Annex.NumCopies
|
|
|
|
|
2020-10-21 14:31:56 +00:00
|
|
|
import qualified Data.ByteString.Char8 as B8
|
|
|
|
import qualified Data.ByteString.Lazy as L
|
2011-03-16 01:34:13 +00:00
|
|
|
|
2015-07-08 16:33:27 +00:00
|
|
|
cmd :: Command
|
2022-06-29 17:28:08 +00:00
|
|
|
cmd = withAnnexOptions [jobsOption, jsonOptions, jsonProgressOption, annexedMatchingOptions] $
|
2015-07-10 17:18:46 +00:00
|
|
|
command "move" SectionCommon
|
|
|
|
"move content of files to/from another repository"
|
|
|
|
paramPaths (seek <--< optParser)
|
2015-07-09 19:23:14 +00:00
|
|
|
|
|
|
|
data MoveOptions = MoveOptions
|
|
|
|
{ moveFiles :: CmdParams
|
2018-04-09 18:29:28 +00:00
|
|
|
, fromToOptions :: FromToHereOptions
|
2018-04-13 18:06:25 +00:00
|
|
|
, removeWhen :: RemoveWhen
|
2015-07-09 19:23:14 +00:00
|
|
|
, keyOptions :: Maybe KeyOptions
|
2017-08-15 16:39:10 +00:00
|
|
|
, batchOption :: BatchMode
|
2015-07-09 19:23:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
optParser :: CmdParamsDesc -> Parser MoveOptions
|
|
|
|
optParser desc = MoveOptions
|
|
|
|
<$> cmdParams desc
|
2018-04-09 18:29:28 +00:00
|
|
|
<*> parseFromToHereOptions
|
2018-04-13 18:06:25 +00:00
|
|
|
<*> pure RemoveSafe
|
2016-08-03 16:37:12 +00:00
|
|
|
<*> optional (parseKeyOptions <|> parseFailedTransfersOption)
|
2021-08-25 18:20:33 +00:00
|
|
|
<*> parseBatchOption True
|
2015-07-09 19:23:14 +00:00
|
|
|
|
|
|
|
instance DeferredParseClass MoveOptions where
|
|
|
|
finishParse v = MoveOptions
|
|
|
|
<$> pure (moveFiles v)
|
2018-04-09 18:29:28 +00:00
|
|
|
<*> finishParse (fromToOptions v)
|
2018-04-13 18:06:25 +00:00
|
|
|
<*> pure (removeWhen v)
|
2015-07-09 19:23:14 +00:00
|
|
|
<*> pure (keyOptions v)
|
2017-08-15 16:39:10 +00:00
|
|
|
<*> pure (batchOption v)
|
2015-07-09 19:23:14 +00:00
|
|
|
|
2018-04-13 18:06:25 +00:00
|
|
|
data RemoveWhen = RemoveSafe | RemoveNever
|
2018-04-09 20:09:00 +00:00
|
|
|
deriving (Show, Eq)
|
|
|
|
|
2015-07-09 19:23:14 +00:00
|
|
|
seek :: MoveOptions -> CommandSeek
|
2020-05-26 15:55:50 +00:00
|
|
|
seek o = startConcurrency stages $ do
|
2017-08-15 16:39:10 +00:00
|
|
|
case batchOption o of
|
2020-07-24 16:05:28 +00:00
|
|
|
NoBatch -> withKeyOptions (keyOptions o) False seeker
|
2021-08-25 18:20:33 +00:00
|
|
|
(commandAction . keyaction)
|
2020-07-13 21:04:02 +00:00
|
|
|
(withFilesInGitAnnex ww seeker)
|
2020-05-28 19:55:17 +00:00
|
|
|
=<< workTreeItems ww (moveFiles o)
|
2022-01-26 16:59:55 +00:00
|
|
|
Batch fmt -> batchOnly (keyOptions o) (moveFiles o) $
|
|
|
|
batchAnnexed fmt seeker keyaction
|
2020-05-26 15:55:50 +00:00
|
|
|
where
|
2020-07-24 16:56:02 +00:00
|
|
|
seeker = AnnexedFileSeeker
|
|
|
|
{ startAction = start (fromToOptions o) (removeWhen o)
|
|
|
|
, checkContentPresent = case fromToOptions o of
|
|
|
|
Right (FromRemote _) -> Nothing
|
|
|
|
Right (ToRemote _) -> Just True
|
|
|
|
Left ToHere -> Nothing
|
|
|
|
, usesLocationLog = True
|
|
|
|
}
|
2020-05-26 15:55:50 +00:00
|
|
|
stages = case fromToOptions o of
|
|
|
|
Right (FromRemote _) -> downloadStages
|
|
|
|
Right (ToRemote _) -> commandStages
|
|
|
|
Left ToHere -> downloadStages
|
2021-08-25 18:20:33 +00:00
|
|
|
keyaction = startKey (fromToOptions o) (removeWhen o)
|
2020-05-28 19:55:17 +00:00
|
|
|
ww = WarnUnmatchLsFiles
|
2015-07-09 19:23:14 +00:00
|
|
|
|
2020-09-14 20:49:33 +00:00
|
|
|
start :: FromToHereOptions -> RemoveWhen -> SeekInput -> RawFilePath -> Key -> CommandStart
|
|
|
|
start fromto removewhen si f k = start' fromto removewhen afile si k ai
|
2016-07-20 19:22:55 +00:00
|
|
|
where
|
2017-03-10 17:12:24 +00:00
|
|
|
afile = AssociatedFile (Just f)
|
2019-06-06 16:53:24 +00:00
|
|
|
ai = mkActionItem (k, afile)
|
2015-07-09 19:23:14 +00:00
|
|
|
|
2020-09-14 20:49:33 +00:00
|
|
|
startKey :: FromToHereOptions -> RemoveWhen -> (SeekInput, Key, ActionItem) -> CommandStart
|
|
|
|
startKey fromto removewhen (si, k, ai) =
|
|
|
|
start' fromto removewhen (AssociatedFile Nothing) si k ai
|
2015-07-09 19:23:14 +00:00
|
|
|
|
2020-09-14 20:49:33 +00:00
|
|
|
start' :: FromToHereOptions -> RemoveWhen -> AssociatedFile -> SeekInput -> Key -> ActionItem -> CommandStart
|
|
|
|
start' fromto removewhen afile si key ai =
|
2018-04-09 18:38:46 +00:00
|
|
|
case fromto of
|
2017-05-31 20:20:55 +00:00
|
|
|
Right (FromRemote src) ->
|
|
|
|
checkFailedTransferDirection ai Download $
|
2020-09-14 20:49:33 +00:00
|
|
|
fromStart removewhen afile key ai si =<< getParsed src
|
2017-05-31 20:20:55 +00:00
|
|
|
Right (ToRemote dest) ->
|
|
|
|
checkFailedTransferDirection ai Upload $
|
2020-09-14 20:49:33 +00:00
|
|
|
toStart removewhen afile key ai si =<< getParsed dest
|
move --to=here
* move --to=here moves from all reachable remotes to the local repository.
The output of move --from remote is changed slightly, when the remote and
local both have the content. It used to say:
move foo ok
Now:
move foo (from theremote...) ok
That was done so that, when move --to=here is used and the content is
locally present and also in several remotes, it's clear which remotes the
content gets dropped from.
Note that move --to=here will report an error if a non-reachable remote
contains the file, even if the local repository also contains the file. I
think that's reasonable; the user may be intending to move all other copies
of the file from remotes.
OTOH, if a copy of the file is believed to be present in some repository
that is not a configured remote, move --to=here does not report an error.
So a little bit inconsistent, but erroring in this case feels wrong.
copy --to=here came along for free, but it's basically the same behavior as
git-annex get, and probably with not as good messages in edge cases
(especially on failure), so I've not documented it.
This commit was sponsored by Anthony DeRobertis on Patreon.
2017-05-31 20:57:27 +00:00
|
|
|
Left ToHere ->
|
|
|
|
checkFailedTransferDirection ai Download $
|
2020-09-14 20:49:33 +00:00
|
|
|
toHereStart removewhen afile key ai si
|
2010-11-02 23:04:24 +00:00
|
|
|
|
make CommandStart return a StartMessage
The goal is to be able to run CommandStart in the main thread when -J is
used, rather than unncessarily passing it off to a worker thread, which
incurs overhead that is signficant when the CommandStart is going to
quickly decide to stop.
To do that, the message it displays needs to be displayed in the worker
thread, after the CommandStart has run.
Also, the change will mean that CommandStart will no longer necessarily
run with the same Annex state as CommandPerform. While its docs already
said it should avoid modifying Annex state, I audited all the
CommandStart code as part of the conversion. (Note that CommandSeek
already sometimes runs with a different Annex state, and that has not been
a source of any problems, so I am not too worried that this change will
lead to breakage going forward.)
The only modification of Annex state I found was it calling
allowMessages in some Commands that default to noMessages. Dealt with
that by adding a startCustomOutput and a startingUsualMessages.
This lets a command start with noMessages and then select the output it
wants for each CommandStart.
One bit of breakage: onlyActionOn has been removed from commands that used it.
The plan is that, since a StartMessage contains an ActionItem,
when a Key can be extracted from that, the parallel job runner can
run onlyActionOn' automatically. Then commands won't need to worry about
this detail. Future work.
Otherwise, this was a fairly straightforward process of making each
CommandStart compile again. Hopefully other behavior changes were mostly
avoided.
In a few cases, a command had a CommandStart that called a CommandPerform
that then called showStart multiple times. I have collapsed those
down to a single start action. The main command to perhaps suffer from it
is Command.Direct, which used to show a start for each file, and no
longer does.
Another minor behavior change is that some commands used showStart
before, but had an associated file and a Key available, so were changed
to ShowStart with an ActionItemAssociatedFile. That will not change the
normal output or behavior, but --json output will now include the key.
This should not break it for anyone using a real json parser.
2019-06-06 19:42:30 +00:00
|
|
|
describeMoveAction :: RemoveWhen -> String
|
|
|
|
describeMoveAction RemoveNever = "copy"
|
|
|
|
describeMoveAction _ = "move"
|
2010-11-27 21:02:53 +00:00
|
|
|
|
2020-09-14 20:49:33 +00:00
|
|
|
toStart :: RemoveWhen -> AssociatedFile -> Key -> ActionItem -> SeekInput -> Remote -> CommandStart
|
|
|
|
toStart removewhen afile key ai si dest = do
|
2011-10-11 18:43:45 +00:00
|
|
|
u <- getUUID
|
2020-07-24 16:56:02 +00:00
|
|
|
if u == Remote.uuid dest
|
|
|
|
then stop
|
2020-09-14 20:49:33 +00:00
|
|
|
else toStart' dest removewhen afile key ai si
|
2014-03-13 18:51:22 +00:00
|
|
|
|
2020-09-14 20:49:33 +00:00
|
|
|
toStart' :: Remote -> RemoveWhen -> AssociatedFile -> Key -> ActionItem -> SeekInput -> CommandStart
|
|
|
|
toStart' dest removewhen afile key ai si = do
|
2022-06-28 19:28:14 +00:00
|
|
|
fast <- Annex.getRead Annex.fast
|
2018-04-09 20:09:00 +00:00
|
|
|
if fast && removewhen == RemoveNever
|
2014-03-13 18:51:22 +00:00
|
|
|
then ifM (expectedPresent dest key)
|
|
|
|
( stop
|
|
|
|
, go True (pure $ Right False)
|
|
|
|
)
|
|
|
|
else go False (Remote.hasKey dest key)
|
|
|
|
where
|
finish CommandStart transition
The hoped for optimisation of CommandStart with -J did not materialize.
In fact, not runnign CommandStart in parallel is slower than -J3.
So, CommandStart are still run in parallel.
(The actual bad performance I've been seeing with -J in my big repo
has to do with building the remoteList.)
But, this is still progress toward making -J faster, because it gets rid
of the onlyActionOn roadblock in the way of making CommandCleanup jobs
run separate from CommandPerform jobs.
Added OnlyActionOn constructor for ActionItem which fixes the
onlyActionOn breakage in the last commit.
Made CustomOutput include an ActionItem, so even things using it can
specify OnlyActionOn.
In Command.Move and Command.Sync, there were CommandStarts that used
includeCommandAction, so output messages, which is no longer allowed.
Fixed by using startingCustomOutput, but that's still not quite right,
since it prevents message display for the includeCommandAction run
inside it too.
2019-06-12 13:23:26 +00:00
|
|
|
go fastcheck isthere =
|
2020-09-14 20:49:33 +00:00
|
|
|
starting (describeMoveAction removewhen) (OnlyActionOn key ai) si $
|
finish CommandStart transition
The hoped for optimisation of CommandStart with -J did not materialize.
In fact, not runnign CommandStart in parallel is slower than -J3.
So, CommandStart are still run in parallel.
(The actual bad performance I've been seeing with -J in my big repo
has to do with building the remoteList.)
But, this is still progress toward making -J faster, because it gets rid
of the onlyActionOn roadblock in the way of making CommandCleanup jobs
run separate from CommandPerform jobs.
Added OnlyActionOn constructor for ActionItem which fixes the
onlyActionOn breakage in the last commit.
Made CustomOutput include an ActionItem, so even things using it can
specify OnlyActionOn.
In Command.Move and Command.Sync, there were CommandStarts that used
includeCommandAction, so output messages, which is no longer allowed.
Fixed by using startingCustomOutput, but that's still not quite right,
since it prevents message display for the includeCommandAction run
inside it too.
2019-06-12 13:23:26 +00:00
|
|
|
toPerform dest removewhen key afile fastcheck =<< isthere
|
2014-03-13 18:51:22 +00:00
|
|
|
|
|
|
|
expectedPresent :: Remote -> Key -> Annex Bool
|
|
|
|
expectedPresent dest key = do
|
|
|
|
remotes <- Remote.keyPossibilities key
|
|
|
|
return $ dest `elem` remotes
|
|
|
|
|
2018-04-09 20:09:00 +00:00
|
|
|
toPerform :: Remote -> RemoveWhen -> Key -> AssociatedFile -> Bool -> Either String Bool -> CommandPerform
|
2020-10-21 14:31:56 +00:00
|
|
|
toPerform dest removewhen key afile fastcheck isthere = do
|
|
|
|
srcuuid <- getUUID
|
2010-11-02 23:04:24 +00:00
|
|
|
case isthere of
|
|
|
|
Left err -> do
|
2011-11-11 05:52:58 +00:00
|
|
|
showNote err
|
2011-05-15 06:02:46 +00:00
|
|
|
stop
|
2020-10-21 14:31:56 +00:00
|
|
|
Right False -> logMove srcuuid destuuid False key $ \deststartedwithcopy -> do
|
2011-07-19 18:07:23 +00:00
|
|
|
showAction $ "to " ++ Remote.name dest
|
2014-03-22 14:42:38 +00:00
|
|
|
ok <- notifyTransfer Upload afile $
|
2020-12-07 18:44:21 +00:00
|
|
|
upload dest key afile stdRetry
|
2010-11-22 21:51:55 +00:00
|
|
|
if ok
|
2020-10-21 14:31:56 +00:00
|
|
|
then finish deststartedwithcopy $
|
2013-02-26 18:39:37 +00:00
|
|
|
Remote.logStatus dest key InfoPresent
|
2011-05-16 17:27:19 +00:00
|
|
|
else do
|
2022-06-09 19:26:25 +00:00
|
|
|
logMoveCleanup deststartedwithcopy
|
2011-05-16 17:27:19 +00:00
|
|
|
when fastcheck $
|
|
|
|
warning "This could have failed because --fast is enabled."
|
|
|
|
stop
|
2020-11-13 18:19:32 +00:00
|
|
|
Right True -> logMove srcuuid destuuid True key $ \deststartedwithcopy ->
|
2020-10-21 14:31:56 +00:00
|
|
|
finish deststartedwithcopy $
|
|
|
|
unlessM (expectedPresent dest key) $
|
|
|
|
Remote.logStatus dest key InfoPresent
|
2012-11-12 05:05:04 +00:00
|
|
|
where
|
2020-10-21 14:31:56 +00:00
|
|
|
destuuid = Remote.uuid dest
|
2018-04-13 18:06:25 +00:00
|
|
|
finish deststartedwithcopy setpresentremote = case removewhen of
|
2018-04-09 20:09:00 +00:00
|
|
|
RemoveNever -> do
|
2016-06-05 17:51:22 +00:00
|
|
|
setpresentremote
|
2022-06-09 19:26:25 +00:00
|
|
|
logMoveCleanup deststartedwithcopy
|
2018-04-09 20:09:00 +00:00
|
|
|
next $ return True
|
2020-07-25 15:54:34 +00:00
|
|
|
RemoveSafe -> lockContentForRemoval key lockfailed $ \contentlock -> do
|
2018-04-13 18:06:25 +00:00
|
|
|
srcuuid <- getUUID
|
2022-06-09 19:26:25 +00:00
|
|
|
r <- willDropMakeItWorse srcuuid destuuid deststartedwithcopy key afile >>= \case
|
2018-04-13 18:06:25 +00:00
|
|
|
DropAllowed -> drophere setpresentremote contentlock "moved"
|
|
|
|
DropCheckNumCopies -> do
|
2021-06-15 15:38:44 +00:00
|
|
|
(numcopies, mincopies) <- getSafestNumMinCopies afile key
|
2018-04-13 18:06:25 +00:00
|
|
|
(tocheck, verified) <- verifiableCopies key [srcuuid]
|
|
|
|
verifyEnoughCopiesToDrop "" key (Just contentlock)
|
2021-01-06 18:11:08 +00:00
|
|
|
numcopies mincopies [srcuuid] verified
|
2018-04-13 18:06:25 +00:00
|
|
|
(UnVerifiedRemote dest : tocheck)
|
|
|
|
(drophere setpresentremote contentlock . showproof)
|
|
|
|
(faileddrophere setpresentremote)
|
|
|
|
DropWorse -> faileddrophere setpresentremote
|
2022-06-09 19:26:25 +00:00
|
|
|
logMoveCleanup deststartedwithcopy
|
|
|
|
return r
|
2018-04-13 18:06:25 +00:00
|
|
|
showproof proof = "proof: " ++ show proof
|
|
|
|
drophere setpresentremote contentlock reason = do
|
2021-04-06 19:41:24 +00:00
|
|
|
fastDebug "Command.Move" $ unwords
|
2018-04-13 18:06:25 +00:00
|
|
|
[ "Dropping from here"
|
|
|
|
, "(" ++ reason ++ ")"
|
|
|
|
]
|
|
|
|
-- Drop content before updating location logs,
|
|
|
|
-- in case disk space is very low this frees
|
|
|
|
-- up space before writing data to disk.
|
|
|
|
removeAnnex contentlock
|
|
|
|
next $ do
|
|
|
|
() <- setpresentremote
|
2021-06-25 19:22:05 +00:00
|
|
|
Command.Drop.cleanupLocal key (Command.Drop.DroppingUnused False)
|
2018-04-13 18:06:25 +00:00
|
|
|
faileddrophere setpresentremote = do
|
|
|
|
showLongNote "(Use --force to override this check, or adjust numcopies.)"
|
|
|
|
showLongNote "Content not dropped from here."
|
|
|
|
next $ do
|
|
|
|
() <- setpresentremote
|
|
|
|
return False
|
2020-07-25 15:54:34 +00:00
|
|
|
|
|
|
|
-- This occurs when, for example, two files are being dropped
|
|
|
|
-- and have the same content. The seek stage checks if the content
|
|
|
|
-- is present, but due to buffering, may find it present for the
|
|
|
|
-- second file before the first is dropped. If so, nothing remains
|
|
|
|
-- to be done except for cleaning up.
|
2021-06-25 19:22:05 +00:00
|
|
|
lockfailed = next $ Command.Drop.cleanupLocal key (Command.Drop.DroppingUnused False)
|
2010-11-02 23:04:24 +00:00
|
|
|
|
2020-09-14 20:49:33 +00:00
|
|
|
fromStart :: RemoveWhen -> AssociatedFile -> Key -> ActionItem -> SeekInput -> Remote -> CommandStart
|
|
|
|
fromStart removewhen afile key ai si src =
|
2020-07-24 16:56:02 +00:00
|
|
|
stopUnless (fromOk src key) $
|
2020-09-14 20:49:33 +00:00
|
|
|
starting (describeMoveAction removewhen) (OnlyActionOn key ai) si $
|
make CommandStart return a StartMessage
The goal is to be able to run CommandStart in the main thread when -J is
used, rather than unncessarily passing it off to a worker thread, which
incurs overhead that is signficant when the CommandStart is going to
quickly decide to stop.
To do that, the message it displays needs to be displayed in the worker
thread, after the CommandStart has run.
Also, the change will mean that CommandStart will no longer necessarily
run with the same Annex state as CommandPerform. While its docs already
said it should avoid modifying Annex state, I audited all the
CommandStart code as part of the conversion. (Note that CommandSeek
already sometimes runs with a different Annex state, and that has not been
a source of any problems, so I am not too worried that this change will
lead to breakage going forward.)
The only modification of Annex state I found was it calling
allowMessages in some Commands that default to noMessages. Dealt with
that by adding a startCustomOutput and a startingUsualMessages.
This lets a command start with noMessages and then select the output it
wants for each CommandStart.
One bit of breakage: onlyActionOn has been removed from commands that used it.
The plan is that, since a StartMessage contains an ActionItem,
when a Key can be extracted from that, the parallel job runner can
run onlyActionOn' automatically. Then commands won't need to worry about
this detail. Future work.
Otherwise, this was a fairly straightforward process of making each
CommandStart compile again. Hopefully other behavior changes were mostly
avoided.
In a few cases, a command had a CommandStart that called a CommandPerform
that then called showStart multiple times. I have collapsed those
down to a single start action. The main command to perhaps suffer from it
is Command.Direct, which used to show a start for each file, and no
longer does.
Another minor behavior change is that some commands used showStart
before, but had an associated file and a Key available, so were changed
to ShowStart with an ActionItemAssociatedFile. That will not change the
normal output or behavior, but --json output will now include the key.
This should not break it for anyone using a real json parser.
2019-06-06 19:42:30 +00:00
|
|
|
fromPerform src removewhen key afile
|
2012-11-12 05:05:04 +00:00
|
|
|
|
2011-12-31 08:11:39 +00:00
|
|
|
fromOk :: Remote -> Key -> Annex Bool
|
check Remote.hasKeyCheap again
In cd1676d604, it stopped using that to avoid surprising behavior
when the location log and remote content were out of sync.
But, it seems that may have changed some behavior users relied on as
well, and also Remote.hasKeyCheap should be faster than checking then
location log.
So, try Remote.hasKeyCheap first, and only if it does not have the key,
fall back to checking the location log. If the location log still thinks
it's present, go ahead and try to get it, so the user will see a failure
rather than silently skipping a file what whereis says is on the remote.
This does make slightly slower the case where the remote does not have
the key, and location log and Remote.hasKeyCheap agree, since it now
checks both. But only 1 stat slower.
2020-12-15 18:44:00 +00:00
|
|
|
fromOk src key
|
|
|
|
-- check if the remote contains the key, when it can be done cheaply
|
|
|
|
| Remote.hasKeyCheap src =
|
2020-12-15 20:35:06 +00:00
|
|
|
Remote.hasKey src key >>= \case
|
check Remote.hasKeyCheap again
In cd1676d604, it stopped using that to avoid surprising behavior
when the location log and remote content were out of sync.
But, it seems that may have changed some behavior users relied on as
well, and also Remote.hasKeyCheap should be faster than checking then
location log.
So, try Remote.hasKeyCheap first, and only if it does not have the key,
fall back to checking the location log. If the location log still thinks
it's present, go ahead and try to get it, so the user will see a failure
rather than silently skipping a file what whereis says is on the remote.
This does make slightly slower the case where the remote does not have
the key, and location log and Remote.hasKeyCheap agree, since it now
checks both. But only 1 stat slower.
2020-12-15 18:44:00 +00:00
|
|
|
Right True -> return True
|
|
|
|
-- Don't skip getting the key just because the
|
|
|
|
-- remote no longer contains it if the log
|
|
|
|
-- says the remote is supposed to contain it;
|
|
|
|
-- that would be surprising behavior.
|
|
|
|
_ -> checklog
|
|
|
|
| otherwise = checklog
|
|
|
|
where
|
|
|
|
checklog = do
|
|
|
|
u <- getUUID
|
|
|
|
remotes <- Remote.keyPossibilities key
|
|
|
|
return $ u /= Remote.uuid src && elem src remotes
|
2012-11-12 05:05:04 +00:00
|
|
|
|
2018-04-09 20:09:00 +00:00
|
|
|
fromPerform :: Remote -> RemoveWhen -> Key -> AssociatedFile -> CommandPerform
|
|
|
|
fromPerform src removewhen key afile = do
|
move --to=here
* move --to=here moves from all reachable remotes to the local repository.
The output of move --from remote is changed slightly, when the remote and
local both have the content. It used to say:
move foo ok
Now:
move foo (from theremote...) ok
That was done so that, when move --to=here is used and the content is
locally present and also in several remotes, it's clear which remotes the
content gets dropped from.
Note that move --to=here will report an error if a non-reachable remote
contains the file, even if the local repository also contains the file. I
think that's reasonable; the user may be intending to move all other copies
of the file from remotes.
OTOH, if a copy of the file is believed to be present in some repository
that is not a configured remote, move --to=here does not report an error.
So a little bit inconsistent, but erroring in this case feels wrong.
copy --to=here came along for free, but it's basically the same behavior as
git-annex get, and probably with not as good messages in edge cases
(especially on failure), so I've not documented it.
This commit was sponsored by Anthony DeRobertis on Patreon.
2017-05-31 20:57:27 +00:00
|
|
|
showAction $ "from " ++ Remote.name src
|
2020-10-21 14:31:56 +00:00
|
|
|
present <- inAnnex key
|
|
|
|
destuuid <- getUUID
|
|
|
|
logMove srcuuid destuuid present key $ \deststartedwithcopy ->
|
|
|
|
if present
|
|
|
|
then dispatch removewhen deststartedwithcopy True
|
|
|
|
else dispatch removewhen deststartedwithcopy =<< get
|
2012-11-12 05:05:04 +00:00
|
|
|
where
|
2020-12-07 18:44:21 +00:00
|
|
|
get = notifyTransfer Download afile $
|
|
|
|
download src key afile stdRetry
|
2020-10-21 14:31:56 +00:00
|
|
|
|
2022-06-09 19:26:25 +00:00
|
|
|
dispatch _ deststartedwithcopy False = do
|
|
|
|
logMoveCleanup deststartedwithcopy
|
|
|
|
stop -- copy failed
|
|
|
|
dispatch RemoveNever deststartedwithcopy True = do
|
|
|
|
logMoveCleanup deststartedwithcopy
|
|
|
|
next $ return True -- copy complete
|
2018-04-13 18:06:25 +00:00
|
|
|
dispatch RemoveSafe deststartedwithcopy True = lockContentShared key $ \_lck -> do
|
|
|
|
destuuid <- getUUID
|
|
|
|
willDropMakeItWorse srcuuid destuuid deststartedwithcopy key afile >>= \case
|
2022-06-09 19:26:25 +00:00
|
|
|
DropAllowed -> dropremote deststartedwithcopy "moved"
|
2018-04-13 18:06:25 +00:00
|
|
|
DropCheckNumCopies -> do
|
2021-06-15 15:38:44 +00:00
|
|
|
(numcopies, mincopies) <- getSafestNumMinCopies afile key
|
2018-04-13 18:06:25 +00:00
|
|
|
(tocheck, verified) <- verifiableCopies key [Remote.uuid src]
|
2021-01-06 18:11:08 +00:00
|
|
|
verifyEnoughCopiesToDrop "" key Nothing numcopies mincopies [Remote.uuid src] verified
|
2022-06-09 19:26:25 +00:00
|
|
|
tocheck (dropremote deststartedwithcopy . showproof) (faileddropremote deststartedwithcopy)
|
|
|
|
DropWorse -> faileddropremote deststartedwithcopy
|
2020-10-21 14:31:56 +00:00
|
|
|
|
|
|
|
srcuuid = Remote.uuid src
|
|
|
|
|
2018-04-13 18:06:25 +00:00
|
|
|
showproof proof = "proof: " ++ show proof
|
2020-10-21 14:31:56 +00:00
|
|
|
|
2022-06-09 19:26:25 +00:00
|
|
|
dropremote deststartedwithcopy reason = do
|
2021-04-06 19:41:24 +00:00
|
|
|
fastDebug "Command.Move" $ unwords
|
2015-10-09 20:16:03 +00:00
|
|
|
[ "Dropping from remote"
|
|
|
|
, show src
|
2018-04-13 18:06:25 +00:00
|
|
|
, "(" ++ reason ++ ")"
|
2015-10-09 20:16:03 +00:00
|
|
|
]
|
2020-05-14 18:19:28 +00:00
|
|
|
ok <- Remote.action (Remote.removeKey src key)
|
2022-06-09 19:26:25 +00:00
|
|
|
when ok $
|
|
|
|
logMoveCleanup deststartedwithcopy
|
2021-06-25 19:22:05 +00:00
|
|
|
next $ Command.Drop.cleanupRemote key src (Command.Drop.DroppingUnused False) ok
|
2020-10-21 14:31:56 +00:00
|
|
|
|
2022-06-09 19:26:25 +00:00
|
|
|
faileddropremote deststartedwithcopy = do
|
2018-04-13 18:06:25 +00:00
|
|
|
showLongNote "(Use --force to override this check, or adjust numcopies.)"
|
|
|
|
showLongNote $ "Content not dropped from " ++ Remote.name src ++ "."
|
2022-06-09 19:26:25 +00:00
|
|
|
logMoveCleanup deststartedwithcopy
|
2018-04-13 18:06:25 +00:00
|
|
|
next $ return False
|
move --to=here
* move --to=here moves from all reachable remotes to the local repository.
The output of move --from remote is changed slightly, when the remote and
local both have the content. It used to say:
move foo ok
Now:
move foo (from theremote...) ok
That was done so that, when move --to=here is used and the content is
locally present and also in several remotes, it's clear which remotes the
content gets dropped from.
Note that move --to=here will report an error if a non-reachable remote
contains the file, even if the local repository also contains the file. I
think that's reasonable; the user may be intending to move all other copies
of the file from remotes.
OTOH, if a copy of the file is believed to be present in some repository
that is not a configured remote, move --to=here does not report an error.
So a little bit inconsistent, but erroring in this case feels wrong.
copy --to=here came along for free, but it's basically the same behavior as
git-annex get, and probably with not as good messages in edge cases
(especially on failure), so I've not documented it.
This commit was sponsored by Anthony DeRobertis on Patreon.
2017-05-31 20:57:27 +00:00
|
|
|
|
|
|
|
{- Moves (or copies) the content of an annexed file from reachable remotes
|
|
|
|
- to the current repository.
|
|
|
|
-
|
2018-04-13 18:06:25 +00:00
|
|
|
- When moving, the content is removed from all the reachable remotes that
|
|
|
|
- it can safely be removed from. -}
|
2020-09-14 20:49:33 +00:00
|
|
|
toHereStart :: RemoveWhen -> AssociatedFile -> Key -> ActionItem -> SeekInput -> CommandStart
|
|
|
|
toHereStart removewhen afile key ai si =
|
2020-07-24 16:56:02 +00:00
|
|
|
startingNoMessage (OnlyActionOn key ai) $ do
|
move --to=here
* move --to=here moves from all reachable remotes to the local repository.
The output of move --from remote is changed slightly, when the remote and
local both have the content. It used to say:
move foo ok
Now:
move foo (from theremote...) ok
That was done so that, when move --to=here is used and the content is
locally present and also in several remotes, it's clear which remotes the
content gets dropped from.
Note that move --to=here will report an error if a non-reachable remote
contains the file, even if the local repository also contains the file. I
think that's reasonable; the user may be intending to move all other copies
of the file from remotes.
OTOH, if a copy of the file is believed to be present in some repository
that is not a configured remote, move --to=here does not report an error.
So a little bit inconsistent, but erroring in this case feels wrong.
copy --to=here came along for free, but it's basically the same behavior as
git-annex get, and probably with not as good messages in edge cases
(especially on failure), so I've not documented it.
This commit was sponsored by Anthony DeRobertis on Patreon.
2017-05-31 20:57:27 +00:00
|
|
|
rs <- Remote.keyPossibilities key
|
|
|
|
forM_ rs $ \r ->
|
make CommandStart return a StartMessage
The goal is to be able to run CommandStart in the main thread when -J is
used, rather than unncessarily passing it off to a worker thread, which
incurs overhead that is signficant when the CommandStart is going to
quickly decide to stop.
To do that, the message it displays needs to be displayed in the worker
thread, after the CommandStart has run.
Also, the change will mean that CommandStart will no longer necessarily
run with the same Annex state as CommandPerform. While its docs already
said it should avoid modifying Annex state, I audited all the
CommandStart code as part of the conversion. (Note that CommandSeek
already sometimes runs with a different Annex state, and that has not been
a source of any problems, so I am not too worried that this change will
lead to breakage going forward.)
The only modification of Annex state I found was it calling
allowMessages in some Commands that default to noMessages. Dealt with
that by adding a startCustomOutput and a startingUsualMessages.
This lets a command start with noMessages and then select the output it
wants for each CommandStart.
One bit of breakage: onlyActionOn has been removed from commands that used it.
The plan is that, since a StartMessage contains an ActionItem,
when a Key can be extracted from that, the parallel job runner can
run onlyActionOn' automatically. Then commands won't need to worry about
this detail. Future work.
Otherwise, this was a fairly straightforward process of making each
CommandStart compile again. Hopefully other behavior changes were mostly
avoided.
In a few cases, a command had a CommandStart that called a CommandPerform
that then called showStart multiple times. I have collapsed those
down to a single start action. The main command to perhaps suffer from it
is Command.Direct, which used to show a start for each file, and no
longer does.
Another minor behavior change is that some commands used showStart
before, but had an associated file and a Key available, so were changed
to ShowStart with an ActionItemAssociatedFile. That will not change the
normal output or behavior, but --json output will now include the key.
This should not break it for anyone using a real json parser.
2019-06-06 19:42:30 +00:00
|
|
|
includeCommandAction $
|
2020-09-14 20:49:33 +00:00
|
|
|
starting (describeMoveAction removewhen) ai si $
|
make CommandStart return a StartMessage
The goal is to be able to run CommandStart in the main thread when -J is
used, rather than unncessarily passing it off to a worker thread, which
incurs overhead that is signficant when the CommandStart is going to
quickly decide to stop.
To do that, the message it displays needs to be displayed in the worker
thread, after the CommandStart has run.
Also, the change will mean that CommandStart will no longer necessarily
run with the same Annex state as CommandPerform. While its docs already
said it should avoid modifying Annex state, I audited all the
CommandStart code as part of the conversion. (Note that CommandSeek
already sometimes runs with a different Annex state, and that has not been
a source of any problems, so I am not too worried that this change will
lead to breakage going forward.)
The only modification of Annex state I found was it calling
allowMessages in some Commands that default to noMessages. Dealt with
that by adding a startCustomOutput and a startingUsualMessages.
This lets a command start with noMessages and then select the output it
wants for each CommandStart.
One bit of breakage: onlyActionOn has been removed from commands that used it.
The plan is that, since a StartMessage contains an ActionItem,
when a Key can be extracted from that, the parallel job runner can
run onlyActionOn' automatically. Then commands won't need to worry about
this detail. Future work.
Otherwise, this was a fairly straightforward process of making each
CommandStart compile again. Hopefully other behavior changes were mostly
avoided.
In a few cases, a command had a CommandStart that called a CommandPerform
that then called showStart multiple times. I have collapsed those
down to a single start action. The main command to perhaps suffer from it
is Command.Direct, which used to show a start for each file, and no
longer does.
Another minor behavior change is that some commands used showStart
before, but had an associated file and a Key available, so were changed
to ShowStart with an ActionItemAssociatedFile. That will not change the
normal output or behavior, but --json output will now include the key.
This should not break it for anyone using a real json parser.
2019-06-06 19:42:30 +00:00
|
|
|
fromPerform r removewhen key afile
|
finish CommandStart transition
The hoped for optimisation of CommandStart with -J did not materialize.
In fact, not runnign CommandStart in parallel is slower than -J3.
So, CommandStart are still run in parallel.
(The actual bad performance I've been seeing with -J in my big repo
has to do with building the remoteList.)
But, this is still progress toward making -J faster, because it gets rid
of the onlyActionOn roadblock in the way of making CommandCleanup jobs
run separate from CommandPerform jobs.
Added OnlyActionOn constructor for ActionItem which fixes the
onlyActionOn breakage in the last commit.
Made CustomOutput include an ActionItem, so even things using it can
specify OnlyActionOn.
In Command.Move and Command.Sync, there were CommandStarts that used
includeCommandAction, so output messages, which is no longer allowed.
Fixed by using startingCustomOutput, but that's still not quite right,
since it prevents message display for the includeCommandAction run
inside it too.
2019-06-12 13:23:26 +00:00
|
|
|
next $ return True
|
2018-04-13 18:06:25 +00:00
|
|
|
|
|
|
|
{- The goal of this command is to allow the user maximum freedom to move
|
|
|
|
- files as they like, while avoiding making bad situations any worse
|
|
|
|
- than they already were.
|
|
|
|
-
|
|
|
|
- When the destination repository already had a copy of a file
|
|
|
|
- before the move operation began, dropping it from the source
|
|
|
|
- repository reduces the number of copies, and should fail if
|
|
|
|
- that would violate numcopies settings.
|
|
|
|
-
|
2021-05-25 14:57:06 +00:00
|
|
|
- On the other hand, when the destination repository does not already
|
2018-04-13 18:06:25 +00:00
|
|
|
- have a copy of a file, it can be dropped without making numcopies
|
|
|
|
- worse, so the move is allowed even if numcopies is not met.
|
|
|
|
-
|
|
|
|
- Similarly, a file can move from an untrusted repository to another
|
|
|
|
- untrusted repository, even if that is the only copy of the file.
|
|
|
|
-
|
|
|
|
- But, moving a file from a repository with higher trust to an untrusted
|
|
|
|
- repository must still check that there are enough other copies to be
|
|
|
|
- safe.
|
|
|
|
-
|
|
|
|
- Also, required content settings should not be violated.
|
|
|
|
-
|
|
|
|
- This function checks all that. It needs to know if the destination
|
|
|
|
- repository already had a copy of the file before the move began.
|
|
|
|
-}
|
2020-10-21 14:31:56 +00:00
|
|
|
willDropMakeItWorse :: UUID -> UUID -> DestStartedWithCopy -> Key -> AssociatedFile -> Annex DropCheck
|
2022-06-09 19:26:25 +00:00
|
|
|
willDropMakeItWorse srcuuid destuuid (DestStartedWithCopy deststartedwithcopy _) key afile =
|
2021-05-25 14:57:06 +00:00
|
|
|
ifM (Command.Drop.checkRequiredContent (Command.Drop.PreferredContentChecked False) srcuuid key afile)
|
2018-04-13 18:06:25 +00:00
|
|
|
( if deststartedwithcopy
|
|
|
|
then unlessforced DropCheckNumCopies
|
|
|
|
else ifM checktrustlevel
|
|
|
|
( return DropAllowed
|
|
|
|
, unlessforced DropCheckNumCopies
|
|
|
|
)
|
|
|
|
, unlessforced DropWorse
|
|
|
|
)
|
|
|
|
where
|
2022-06-28 19:28:14 +00:00
|
|
|
unlessforced r = ifM (Annex.getRead Annex.force)
|
2018-04-13 18:06:25 +00:00
|
|
|
( return DropAllowed
|
|
|
|
, return r
|
|
|
|
)
|
|
|
|
checktrustlevel = do
|
|
|
|
desttrust <- lookupTrust destuuid
|
|
|
|
srctrust <- lookupTrust srcuuid
|
2018-04-13 19:16:07 +00:00
|
|
|
return (desttrust > UnTrusted || desttrust >= srctrust)
|
2018-04-13 18:06:25 +00:00
|
|
|
|
|
|
|
data DropCheck = DropWorse | DropAllowed | DropCheckNumCopies
|
2020-10-21 14:31:56 +00:00
|
|
|
|
2022-06-09 19:26:25 +00:00
|
|
|
data DestStartedWithCopy = DestStartedWithCopy Bool (Annex ())
|
|
|
|
|
|
|
|
{- This should be called once the move has succeeded, or if it failed
|
|
|
|
- without doing anything. It should not be called if the move transferred
|
|
|
|
- the content but failed to drop due to eg a network error. In such a
|
|
|
|
- case, the move can be restarted later, so the move log should be
|
|
|
|
- preserved. -}
|
|
|
|
logMoveCleanup :: DestStartedWithCopy -> Annex ()
|
|
|
|
logMoveCleanup (DestStartedWithCopy _ a) = a
|
2020-10-21 14:31:56 +00:00
|
|
|
|
|
|
|
{- Runs an action that performs a move, and logs the move, allowing an
|
2022-06-09 19:26:25 +00:00
|
|
|
- failed or interrupted move to be re-done later.
|
2020-10-21 14:31:56 +00:00
|
|
|
-
|
|
|
|
- This deals with the situation where dest did not start with a copy,
|
|
|
|
- but the move downloaded it, and was then interrupted before dropping
|
|
|
|
- it from the source. Re-running the move would see dest has a
|
|
|
|
- copy, and so could refuse to allow the drop. By providing the logged
|
|
|
|
- DestStartedWithCopy, this avoids that annoyance.
|
|
|
|
-}
|
|
|
|
logMove :: UUID -> UUID -> Bool -> Key -> (DestStartedWithCopy -> Annex a) -> Annex a
|
2022-06-09 19:26:25 +00:00
|
|
|
logMove srcuuid destuuid deststartedwithcopy key a = go =<< setup
|
2020-10-21 14:31:56 +00:00
|
|
|
where
|
|
|
|
logline = L.fromStrict $ B8.unwords
|
|
|
|
[ fromUUID srcuuid
|
|
|
|
, fromUUID destuuid
|
|
|
|
, serializeKey' key
|
|
|
|
]
|
|
|
|
|
|
|
|
setup = do
|
|
|
|
logf <- fromRepo gitAnnexMoveLog
|
2022-08-11 20:57:44 +00:00
|
|
|
lckf <- fromRepo gitAnnexMoveLock
|
2020-10-21 14:31:56 +00:00
|
|
|
-- Only log when there was no copy.
|
|
|
|
unless deststartedwithcopy $
|
2022-08-11 20:57:44 +00:00
|
|
|
appendLogFile logf lckf logline
|
2020-10-21 14:31:56 +00:00
|
|
|
return logf
|
|
|
|
|
|
|
|
cleanup logf = do
|
2022-08-11 20:57:44 +00:00
|
|
|
lck <- fromRepo gitAnnexMoveLock
|
2020-10-21 14:31:56 +00:00
|
|
|
-- This buffers the log file content in memory.
|
|
|
|
-- The log file length is limited to the number of
|
|
|
|
-- concurrent jobs, times the number of times a move
|
|
|
|
-- (of different files) has been interrupted.
|
|
|
|
-- That could grow without bounds given enough time,
|
|
|
|
-- so the log is also truncated to the most recent
|
|
|
|
-- 100 items.
|
2022-08-11 20:57:44 +00:00
|
|
|
modifyLogFile logf lck
|
2020-10-21 14:31:56 +00:00
|
|
|
(filter (/= logline) . reverse . take 100 . reverse)
|
|
|
|
|
|
|
|
go logf
|
|
|
|
-- Only need to check log when there is a copy.
|
|
|
|
| deststartedwithcopy = do
|
2022-08-11 20:57:44 +00:00
|
|
|
lck <- fromRepo gitAnnexMoveLock
|
|
|
|
wasnocopy <- checkLogFile (fromRawFilePath logf) lck
|
2020-10-21 14:31:56 +00:00
|
|
|
(== logline)
|
|
|
|
if wasnocopy
|
2022-06-09 19:26:25 +00:00
|
|
|
then go' logf False
|
|
|
|
else go' logf deststartedwithcopy
|
|
|
|
| otherwise = go' logf deststartedwithcopy
|
2020-10-21 14:31:56 +00:00
|
|
|
|
2022-06-09 19:26:25 +00:00
|
|
|
go' logf deststartedwithcopy' = a $
|
|
|
|
DestStartedWithCopy deststartedwithcopy' (cleanup logf)
|