2010-10-27 20:53:54 +00:00
|
|
|
|
{- git-annex monad
|
|
|
|
|
-
|
2020-02-27 04:52:37 +00:00
|
|
|
|
- Copyright 2010-2020 Joey Hess <id@joeyh.name>
|
2010-10-27 20:53:54 +00:00
|
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2010-10-27 20:53:54 +00:00
|
|
|
|
-}
|
2010-10-10 19:04:07 +00:00
|
|
|
|
|
2020-11-10 00:07:31 +00:00
|
|
|
|
{-# LANGUAGE GeneralizedNewtypeDeriving, BangPatterns #-}
|
2011-08-19 18:28:07 +00:00
|
|
|
|
|
2010-10-11 21:52:46 +00:00
|
|
|
|
module Annex (
|
2011-01-26 01:49:04 +00:00
|
|
|
|
Annex,
|
|
|
|
|
AnnexState(..),
|
2010-10-14 07:18:11 +00:00
|
|
|
|
new,
|
|
|
|
|
run,
|
2010-11-01 03:24:16 +00:00
|
|
|
|
eval,
|
2015-10-09 17:35:28 +00:00
|
|
|
|
makeRunner,
|
2011-01-26 04:17:38 +00:00
|
|
|
|
getState,
|
|
|
|
|
changeState,
|
2014-08-20 16:01:45 +00:00
|
|
|
|
withState,
|
more command-specific options
Made --from and --to command-specific options.
Added generic storage for values of command-specific options,
which allows removing some of the special case fields in AnnexState.
(Also added generic storage for command-specific flags, although there are
not yet any.)
Note that this storage uses a Map, so repeatedly looking up the same value
is slightly more expensive than looking up an AnnexState field. But, the
value can be looked up once in the seek stage, transformed as necessary,
and passed in a closure to the start stage, and this avoids that overhead.
Still, I'm hesitant to use this for things like force or fast flags.
It's probably best to reserve it for flags that are only used by a few
commands, or options like --from and --to that it's important only be
allowed to be used with commands that implement them, to avoid user
confusion.
2012-01-06 07:06:25 +00:00
|
|
|
|
setFlag,
|
|
|
|
|
setField,
|
2012-04-30 17:59:05 +00:00
|
|
|
|
setOutput,
|
more command-specific options
Made --from and --to command-specific options.
Added generic storage for values of command-specific options,
which allows removing some of the special case fields in AnnexState.
(Also added generic storage for command-specific flags, although there are
not yet any.)
Note that this storage uses a Map, so repeatedly looking up the same value
is slightly more expensive than looking up an AnnexState field. But, the
value can be looked up once in the seek stage, transformed as necessary,
and passed in a closure to the start stage, and this avoids that overhead.
Still, I'm hesitant to use this for things like force or fast flags.
It's probably best to reserve it for flags that are only used by a few
commands, or options like --from and --to that it's important only be
allowed to be used with commands that implement them, to avoid user
confusion.
2012-01-06 07:06:25 +00:00
|
|
|
|
getFlag,
|
|
|
|
|
getField,
|
2012-02-25 22:02:49 +00:00
|
|
|
|
addCleanup,
|
2011-11-08 19:34:10 +00:00
|
|
|
|
gitRepo,
|
|
|
|
|
inRepo,
|
|
|
|
|
fromRepo,
|
2013-04-04 19:46:33 +00:00
|
|
|
|
calcRepo,
|
2013-01-01 17:52:47 +00:00
|
|
|
|
getGitConfig,
|
rename changeGitConfig to overrideGitConfig and avoid unncessary calls
It's important that it be clear that it overrides a config, such that
reloading the git config won't change it, and in particular, setConfig
won't change it.
Most of the calls to changeGitConfig were actually after setConfig,
which was redundant and unncessary. So removed those.
The only remaining one, besides --debug, is in the handling of
repository-global config values. That one's ok, because the
way mergeGitConfig is implemented, it does not override any value that
is set in git config. If a value with a repo-global setting was passed
to setConfig, it would set it in the git config, reload the git config,
re-apply mergeGitConfig, and use the newly set value, which is the right
thing.
2020-02-27 05:06:35 +00:00
|
|
|
|
overrideGitConfig,
|
2012-12-30 03:10:18 +00:00
|
|
|
|
changeGitRepo,
|
2016-01-22 17:47:41 +00:00
|
|
|
|
adjustGitRepo,
|
refix bug in a better way
Always run Git.Config.store, so when the git config gets reloaded,
the override gets re-added to it, and changeGitRepo then calls extractGitConfig
on it and sees the annex.* settings from the override.
Remove any prior occurance of -c v and add it to the end. This way,
-c foo=1 -c foo=2 -c foo=1 will pass -c foo=1 to git, rather than -c foo=2
Note that, if git had some multiline config that got built up by
multiple -c's, this would not work still. But it never worked because
before the bug got fixed in the first place, the -c value was repeated
many times, so the multivalue thing would have been wrong. I don't think
-c can be used with multiline configs anyway, though git-config does
talk about them?
2020-07-02 17:32:33 +00:00
|
|
|
|
addGitConfigOverride,
|
2014-05-16 20:08:20 +00:00
|
|
|
|
getRemoteGitConfig,
|
2013-03-12 20:41:54 +00:00
|
|
|
|
withCurrentState,
|
2015-01-07 02:23:04 +00:00
|
|
|
|
changeDirectory,
|
2018-01-09 19:36:56 +00:00
|
|
|
|
getGitRemotes,
|
2015-04-30 19:04:01 +00:00
|
|
|
|
incError,
|
2010-10-11 21:52:46 +00:00
|
|
|
|
) where
|
2010-10-10 19:04:07 +00:00
|
|
|
|
|
2011-10-04 02:24:57 +00:00
|
|
|
|
import Common
|
2011-06-30 17:16:57 +00:00
|
|
|
|
import qualified Git
|
2011-12-13 19:05:07 +00:00
|
|
|
|
import qualified Git.Config
|
2018-01-09 19:36:56 +00:00
|
|
|
|
import qualified Git.Construct
|
2015-03-02 20:43:44 +00:00
|
|
|
|
import Annex.Fixup
|
2016-03-14 19:58:46 +00:00
|
|
|
|
import Git.HashObject
|
2012-02-14 03:42:44 +00:00
|
|
|
|
import Git.CheckAttr
|
gitignore support for the assistant and watcher
Requires git 1.8.4 or newer. When it's installed, a background
git check-ignore process is run, and used to efficiently check ignores
whenever a new file is added.
Thanks to Adam Spiers, for getting the necessary support into git for this.
A complication is what to do about files that are gitignored but have
been checked into git anyway. git commands assume the ignore has been
overridden in this case, and not need any more overriding to commit a
changed version.
However, for the assistant to do the same, it would have to run git ls-files
to check if the ignored file is in git. This is somewhat expensive. Or it
could use the running git-cat-file process to query the file that way,
but that requires transferring the whole file content over a pipe, so it
can be quite expensive too, for files that are not git-annex
symlinks.
Now imagine if the user knows that a file or directory tree will be getting
frequent changes, and doesn't want the assistant to sync it, so gitignores
it. The assistant could overload the system with repeated ls-files checks!
So, I've decided that the assistant will not automatically commit changes
to files that are gitignored. This is a tradeoff. Hopefully it won't be a
problem to adjust .gitignore settings to not ignore files you want the
assistant to autocommit, or to manually git annex add files that are listed
in .gitignore.
(This could be revisited if git-annex gets access to an interface to check
the content of the index w/o forking a git command. This could be libgit2,
or perhaps a separate git cat-file --batch-check process, so it wouldn't
need to ship over the whole file content.)
This commit was sponsored by Francois Marier. Thanks!
2013-08-02 23:31:55 +00:00
|
|
|
|
import Git.CheckIgnore
|
2014-03-02 22:01:07 +00:00
|
|
|
|
import qualified Git.Hook
|
2011-12-20 18:37:53 +00:00
|
|
|
|
import qualified Git.Queue
|
2014-01-22 20:35:32 +00:00
|
|
|
|
import Types.Key
|
2011-06-02 01:56:04 +00:00
|
|
|
|
import Types.Backend
|
2013-01-01 17:52:47 +00:00
|
|
|
|
import Types.GitConfig
|
2011-09-19 00:11:39 +00:00
|
|
|
|
import qualified Types.Remote
|
2011-06-02 01:56:04 +00:00
|
|
|
|
import Types.Crypto
|
2011-06-22 19:58:30 +00:00
|
|
|
|
import Types.BranchState
|
2011-06-24 01:25:39 +00:00
|
|
|
|
import Types.TrustLevel
|
2012-10-01 19:12:04 +00:00
|
|
|
|
import Types.Group
|
2012-04-27 17:23:52 +00:00
|
|
|
|
import Types.Messages
|
2016-09-09 16:57:42 +00:00
|
|
|
|
import Types.Concurrency
|
2012-10-04 19:48:59 +00:00
|
|
|
|
import Types.UUID
|
2013-05-25 03:07:26 +00:00
|
|
|
|
import Types.FileMatcher
|
2014-01-21 20:08:19 +00:00
|
|
|
|
import Types.NumCopies
|
2015-05-18 20:23:07 +00:00
|
|
|
|
import Types.LockCache
|
2014-03-22 14:42:38 +00:00
|
|
|
|
import Types.DesktopNotify
|
2014-03-13 23:06:26 +00:00
|
|
|
|
import Types.CleanupActions
|
2018-10-19 19:17:48 +00:00
|
|
|
|
import Types.AdjustedBranch
|
2019-06-05 17:03:05 +00:00
|
|
|
|
import Types.WorkerPool
|
2020-04-10 17:37:04 +00:00
|
|
|
|
import Types.IndexFiles
|
2020-04-20 17:53:27 +00:00
|
|
|
|
import Types.CatFileHandles
|
2020-09-22 17:52:26 +00:00
|
|
|
|
import Types.RemoteConfig
|
2020-12-07 17:08:59 +00:00
|
|
|
|
import Types.TransferrerPool
|
2015-12-23 22:34:51 +00:00
|
|
|
|
import qualified Database.Keys.Handle as Keys
|
fix for Windows file timestamp timezone madness
On Windows, changing the time zone causes the apparent mtime of files to
change. This confuses git-annex, which natually thinks this means the files
have actually been modified (since THAT'S WHAT A MTIME IS FOR, BILL <sheesh>).
Work around this stupidity, by using the inode sentinal file to detect if
the timezone has changed, and calculate a TSDelta, which will be applied
when generating InodeCaches.
This should add no overhead at all on unix. Indeed, I sped up a few
things slightly in the refactoring.
Seems to basically work! But it has a big known problem:
If the timezone changes while the assistant (or a long-running command)
runs, it won't notice, since it only checks the inode cache once, and
so will use the old delta for all new inode caches it generates for new
files it's added. Which will result in them seeming changed the next time
it runs.
This commit was sponsored by Vincent Demeester.
2014-06-11 21:51:12 +00:00
|
|
|
|
import Utility.InodeCache
|
2014-12-08 23:14:24 +00:00
|
|
|
|
import Utility.Url
|
check-attr resource pool
Limited to min of -JN or number of CPU cores, because it will often be
CPU bound, once it's read the gitignore file for a directory.
In some situations it's more disk bound, but in any case it's unlikely
to be the main bottleneck that -J is used to avoid. Eg, when dropping,
this is used for numcopies checks, but the main bottleneck will be
accessing the remotes to verify presence. So the user might decide to
-J32 that, but having 32 check-attr processes would just waste however
many filehandles they open, and probably worsen their performance due to
CPU contention.
Note that, I first tried just letting up to the -JN be started. However,
even when it's no bottleneck at all, that still results in all of them
being started. Why? Well, all the worker threads start up nearly
simulantaneously, so there's a thundering herd..
2020-04-21 14:38:44 +00:00
|
|
|
|
import Utility.ResourcePool
|
fix for Windows file timestamp timezone madness
On Windows, changing the time zone causes the apparent mtime of files to
change. This confuses git-annex, which natually thinks this means the files
have actually been modified (since THAT'S WHAT A MTIME IS FOR, BILL <sheesh>).
Work around this stupidity, by using the inode sentinal file to detect if
the timezone has changed, and calculate a TSDelta, which will be applied
when generating InodeCaches.
This should add no overhead at all on unix. Indeed, I sped up a few
things slightly in the refactoring.
Seems to basically work! But it has a big known problem:
If the timezone changes while the assistant (or a long-running command)
runs, it won't notice, since it only checks the inode cache once, and
so will use the old delta for all new inode caches it generates for new
files it's added. Which will result in them seeming changed the next time
it runs.
This commit was sponsored by Vincent Demeester.
2014-06-11 21:51:12 +00:00
|
|
|
|
|
|
|
|
|
import "mtl" Control.Monad.Reader
|
|
|
|
|
import Control.Concurrent
|
2017-05-11 22:29:51 +00:00
|
|
|
|
import Control.Concurrent.STM
|
2019-01-05 15:54:06 +00:00
|
|
|
|
import qualified Control.Monad.Fail as Fail
|
2018-04-22 17:28:31 +00:00
|
|
|
|
import qualified Data.Map.Strict as M
|
fix for Windows file timestamp timezone madness
On Windows, changing the time zone causes the apparent mtime of files to
change. This confuses git-annex, which natually thinks this means the files
have actually been modified (since THAT'S WHAT A MTIME IS FOR, BILL <sheesh>).
Work around this stupidity, by using the inode sentinal file to detect if
the timezone has changed, and calculate a TSDelta, which will be applied
when generating InodeCaches.
This should add no overhead at all on unix. Indeed, I sped up a few
things slightly in the refactoring.
Seems to basically work! But it has a big known problem:
If the timezone changes while the assistant (or a long-running command)
runs, it won't notice, since it only checks the inode cache once, and
so will use the old delta for all new inode caches it generates for new
files it's added. Which will result in them seeming changed the next time
it runs.
This commit was sponsored by Vincent Demeester.
2014-06-11 21:51:12 +00:00
|
|
|
|
import qualified Data.Set as S
|
2011-01-26 01:49:04 +00:00
|
|
|
|
|
Switch to MonadCatchIO-transformers for better handling of state while catching exceptions.
As seen in this bug report, the lifted exception handling using the StateT
monad throws away state changes when an action throws an exception.
http://git-annex.branchable.com/bugs/git_annex_fork_bombs_on_gpg_file/
.. Which can result in cached values being redundantly calculated, or other
possibly worse bugs when the annex state gets out of sync with reality.
This switches from a StateT AnnexState to a ReaderT (MVar AnnexState).
All changes to the state go via the MVar. So when an Annex action is
running inside an exception handler, and it makes some changes, they
immediately go into affect in the MVar. If it then throws an exception
(or even crashes its thread!), the state changes are still in effect.
The MonadCatchIO-transformers change is actually only incidental.
I could have kept on using lifted-base for the exception handling.
However, I'd have needed to write a new instance of MonadBaseControl
for the new monad.. and I didn't write the old instance.. I begged Bas
and he kindly sent it to me. Happily, MonadCatchIO-transformers is
able to derive a MonadCatchIO instance for my monad.
This is a deep level change. It passes the test suite! What could it break?
Well.. The most likely breakage would be to code that runs an Annex action
in an exception handler, and *wants* state changes to be thrown away.
Perhaps the state changes leaves the state inconsistent, or wrong. Since
there are relatively few places in git-annex that catch exceptions in the
Annex monad, and the AnnexState is generally just used to cache calculated
data, this is unlikely to be a problem.
Oh yeah, this change also makes Assistant.Types.ThreadedMonad a bit
redundant. It's now entirely possible to run concurrent Annex actions in
different threads, all sharing access to the same state! The ThreadedMonad
just adds some extra work on top of that, with its own MVar, and avoids
such actions possibly stepping on one-another's toes. I have not gotten
rid of it, but might try that later. Being able to run concurrent Annex
actions would simplify parts of the Assistant code.
2013-05-19 18:16:36 +00:00
|
|
|
|
{- git-annex's monad is a ReaderT around an AnnexState stored in a MVar.
|
|
|
|
|
- The MVar is not exposed outside this module.
|
unify exception handling into Utility.Exception
Removed old extensible-exceptions, only needed for very old ghc.
Made webdav use Utility.Exception, to work after some changes in DAV's
exception handling.
Removed Annex.Exception. Mostly this was trivial, but note that
tryAnnex is replaced with tryNonAsync and catchAnnex replaced with
catchNonAsync. In theory that could be a behavior change, since the former
caught all exceptions, and the latter don't catch async exceptions.
However, in practice, nothing in the Annex monad uses async exceptions.
Grepping for throwTo and killThread only find stuff in the assistant,
which does not seem related.
Command.Add.undo is changed to accept a SomeException, and things
that use it for rollback now catch non-async exceptions, rather than
only IOExceptions.
2014-08-08 01:55:44 +00:00
|
|
|
|
-
|
|
|
|
|
- Note that when an Annex action fails and the exception is caught,
|
2016-09-06 16:42:50 +00:00
|
|
|
|
- any changes the action has made to the AnnexState are retained,
|
unify exception handling into Utility.Exception
Removed old extensible-exceptions, only needed for very old ghc.
Made webdav use Utility.Exception, to work after some changes in DAV's
exception handling.
Removed Annex.Exception. Mostly this was trivial, but note that
tryAnnex is replaced with tryNonAsync and catchAnnex replaced with
catchNonAsync. In theory that could be a behavior change, since the former
caught all exceptions, and the latter don't catch async exceptions.
However, in practice, nothing in the Annex monad uses async exceptions.
Grepping for throwTo and killThread only find stuff in the assistant,
which does not seem related.
Command.Add.undo is changed to accept a SomeException, and things
that use it for rollback now catch non-async exceptions, rather than
only IOExceptions.
2014-08-08 01:55:44 +00:00
|
|
|
|
- due to the use of the MVar to store the state.
|
Switch to MonadCatchIO-transformers for better handling of state while catching exceptions.
As seen in this bug report, the lifted exception handling using the StateT
monad throws away state changes when an action throws an exception.
http://git-annex.branchable.com/bugs/git_annex_fork_bombs_on_gpg_file/
.. Which can result in cached values being redundantly calculated, or other
possibly worse bugs when the annex state gets out of sync with reality.
This switches from a StateT AnnexState to a ReaderT (MVar AnnexState).
All changes to the state go via the MVar. So when an Annex action is
running inside an exception handler, and it makes some changes, they
immediately go into affect in the MVar. If it then throws an exception
(or even crashes its thread!), the state changes are still in effect.
The MonadCatchIO-transformers change is actually only incidental.
I could have kept on using lifted-base for the exception handling.
However, I'd have needed to write a new instance of MonadBaseControl
for the new monad.. and I didn't write the old instance.. I begged Bas
and he kindly sent it to me. Happily, MonadCatchIO-transformers is
able to derive a MonadCatchIO instance for my monad.
This is a deep level change. It passes the test suite! What could it break?
Well.. The most likely breakage would be to code that runs an Annex action
in an exception handler, and *wants* state changes to be thrown away.
Perhaps the state changes leaves the state inconsistent, or wrong. Since
there are relatively few places in git-annex that catch exceptions in the
Annex monad, and the AnnexState is generally just used to cache calculated
data, this is unlikely to be a problem.
Oh yeah, this change also makes Assistant.Types.ThreadedMonad a bit
redundant. It's now entirely possible to run concurrent Annex actions in
different threads, all sharing access to the same state! The ThreadedMonad
just adds some extra work on top of that, with its own MVar, and avoids
such actions possibly stepping on one-another's toes. I have not gotten
rid of it, but might try that later. Being able to run concurrent Annex
actions would simplify parts of the Assistant code.
2013-05-19 18:16:36 +00:00
|
|
|
|
-}
|
|
|
|
|
newtype Annex a = Annex { runAnnex :: ReaderT (MVar AnnexState) IO a }
|
2011-08-19 18:28:07 +00:00
|
|
|
|
deriving (
|
|
|
|
|
Monad,
|
|
|
|
|
MonadIO,
|
Switch to MonadCatchIO-transformers for better handling of state while catching exceptions.
As seen in this bug report, the lifted exception handling using the StateT
monad throws away state changes when an action throws an exception.
http://git-annex.branchable.com/bugs/git_annex_fork_bombs_on_gpg_file/
.. Which can result in cached values being redundantly calculated, or other
possibly worse bugs when the annex state gets out of sync with reality.
This switches from a StateT AnnexState to a ReaderT (MVar AnnexState).
All changes to the state go via the MVar. So when an Annex action is
running inside an exception handler, and it makes some changes, they
immediately go into affect in the MVar. If it then throws an exception
(or even crashes its thread!), the state changes are still in effect.
The MonadCatchIO-transformers change is actually only incidental.
I could have kept on using lifted-base for the exception handling.
However, I'd have needed to write a new instance of MonadBaseControl
for the new monad.. and I didn't write the old instance.. I begged Bas
and he kindly sent it to me. Happily, MonadCatchIO-transformers is
able to derive a MonadCatchIO instance for my monad.
This is a deep level change. It passes the test suite! What could it break?
Well.. The most likely breakage would be to code that runs an Annex action
in an exception handler, and *wants* state changes to be thrown away.
Perhaps the state changes leaves the state inconsistent, or wrong. Since
there are relatively few places in git-annex that catch exceptions in the
Annex monad, and the AnnexState is generally just used to cache calculated
data, this is unlikely to be a problem.
Oh yeah, this change also makes Assistant.Types.ThreadedMonad a bit
redundant. It's now entirely possible to run concurrent Annex actions in
different threads, all sharing access to the same state! The ThreadedMonad
just adds some extra work on top of that, with its own MVar, and avoids
such actions possibly stepping on one-another's toes. I have not gotten
rid of it, but might try that later. Being able to run concurrent Annex
actions would simplify parts of the Assistant code.
2013-05-19 18:16:36 +00:00
|
|
|
|
MonadReader (MVar AnnexState),
|
2014-05-28 21:01:57 +00:00
|
|
|
|
MonadCatch,
|
|
|
|
|
MonadThrow,
|
|
|
|
|
MonadMask,
|
2019-01-05 15:54:06 +00:00
|
|
|
|
Fail.MonadFail,
|
2011-08-25 04:28:55 +00:00
|
|
|
|
Functor,
|
2019-02-26 17:11:25 +00:00
|
|
|
|
Applicative,
|
|
|
|
|
Alternative
|
2011-08-19 18:28:07 +00:00
|
|
|
|
)
|
2011-01-26 01:49:04 +00:00
|
|
|
|
|
|
|
|
|
-- internal state storage
|
2011-01-26 04:17:38 +00:00
|
|
|
|
data AnnexState = AnnexState
|
|
|
|
|
{ repo :: Git.Repo
|
2016-01-22 17:47:41 +00:00
|
|
|
|
, repoadjustment :: (Git.Repo -> IO Git.Repo)
|
2013-01-01 17:52:47 +00:00
|
|
|
|
, gitconfig :: GitConfig
|
2020-02-27 04:52:37 +00:00
|
|
|
|
, gitconfigadjustment :: (GitConfig -> GitConfig)
|
2018-01-09 19:36:56 +00:00
|
|
|
|
, gitremotes :: Maybe [Git.Repo]
|
2017-05-09 19:04:07 +00:00
|
|
|
|
, backend :: Maybe (BackendA Annex)
|
2011-12-31 08:11:39 +00:00
|
|
|
|
, remotes :: [Types.Remote.RemoteA Annex]
|
2012-04-27 17:23:52 +00:00
|
|
|
|
, output :: MessageState
|
2020-09-16 15:41:28 +00:00
|
|
|
|
, concurrency :: ConcurrencySetting
|
2011-01-26 04:17:38 +00:00
|
|
|
|
, force :: Bool
|
2011-03-22 21:41:06 +00:00
|
|
|
|
, fast :: Bool
|
2013-05-25 04:37:41 +00:00
|
|
|
|
, daemon :: Bool
|
2011-06-22 19:58:30 +00:00
|
|
|
|
, branchstate :: BranchState
|
2019-11-12 14:44:51 +00:00
|
|
|
|
, repoqueue :: Maybe (Git.Queue.Queue Annex)
|
2020-04-20 17:53:27 +00:00
|
|
|
|
, catfilehandles :: CatFileHandles
|
2016-03-14 19:58:46 +00:00
|
|
|
|
, hashobjecthandle :: Maybe HashObjectHandle
|
check-attr resource pool
Limited to min of -JN or number of CPU cores, because it will often be
CPU bound, once it's read the gitignore file for a directory.
In some situations it's more disk bound, but in any case it's unlikely
to be the main bottleneck that -J is used to avoid. Eg, when dropping,
this is used for numcopies checks, but the main bottleneck will be
accessing the remotes to verify presence. So the user might decide to
-J32 that, but having 32 check-attr processes would just waste however
many filehandles they open, and probably worsen their performance due to
CPU contention.
Note that, I first tried just letting up to the -JN be started. However,
even when it's no bottleneck at all, that still results in all of them
being started. Why? Well, all the worker threads start up nearly
simulantaneously, so there's a thundering herd..
2020-04-21 14:38:44 +00:00
|
|
|
|
, checkattrhandle :: Maybe (ResourcePool CheckAttrHandle)
|
2020-04-21 15:20:10 +00:00
|
|
|
|
, checkignorehandle :: Maybe (ResourcePool CheckIgnoreHandle)
|
2011-05-18 23:34:46 +00:00
|
|
|
|
, forcebackend :: Maybe String
|
2014-01-21 20:08:19 +00:00
|
|
|
|
, globalnumcopies :: Maybe NumCopies
|
2014-01-21 21:08:49 +00:00
|
|
|
|
, forcenumcopies :: Maybe NumCopies
|
2014-03-29 18:43:34 +00:00
|
|
|
|
, limit :: ExpandableMatcher Annex
|
2019-01-01 19:39:45 +00:00
|
|
|
|
, uuiddescmap :: Maybe UUIDDescMap
|
2014-03-29 18:43:34 +00:00
|
|
|
|
, preferredcontentmap :: Maybe (FileMatcherMap Annex)
|
|
|
|
|
, requiredcontentmap :: Maybe (FileMatcherMap Annex)
|
2020-09-22 17:52:26 +00:00
|
|
|
|
, remoteconfigmap :: Maybe (M.Map UUID RemoteConfig)
|
2012-01-10 03:31:44 +00:00
|
|
|
|
, forcetrust :: TrustMap
|
2011-06-24 01:25:39 +00:00
|
|
|
|
, trustmap :: Maybe TrustMap
|
2012-10-01 19:12:04 +00:00
|
|
|
|
, groupmap :: Maybe GroupMap
|
2012-04-29 18:02:18 +00:00
|
|
|
|
, ciphers :: M.Map StorableCipher Cipher
|
2015-05-18 20:23:07 +00:00
|
|
|
|
, lockcache :: LockCache
|
2017-05-11 22:29:51 +00:00
|
|
|
|
, sshstalecleaned :: TMVar Bool
|
more command-specific options
Made --from and --to command-specific options.
Added generic storage for values of command-specific options,
which allows removing some of the special case fields in AnnexState.
(Also added generic storage for command-specific flags, although there are
not yet any.)
Note that this storage uses a Map, so repeatedly looking up the same value
is slightly more expensive than looking up an AnnexState field. But, the
value can be looked up once in the seek stage, transformed as necessary,
and passed in a closure to the start stage, and this avoids that overhead.
Still, I'm hesitant to use this for things like force or fast flags.
It's probably best to reserve it for flags that are only used by a few
commands, or options like --from and --to that it's important only be
allowed to be used with commands that implement them, to avoid user
confusion.
2012-01-06 07:06:25 +00:00
|
|
|
|
, flags :: M.Map String Bool
|
|
|
|
|
, fields :: M.Map String String
|
2014-03-13 23:06:26 +00:00
|
|
|
|
, cleanup :: M.Map CleanupAction (Annex ())
|
fix for Windows file timestamp timezone madness
On Windows, changing the time zone causes the apparent mtime of files to
change. This confuses git-annex, which natually thinks this means the files
have actually been modified (since THAT'S WHAT A MTIME IS FOR, BILL <sheesh>).
Work around this stupidity, by using the inode sentinal file to detect if
the timezone has changed, and calculate a TSDelta, which will be applied
when generating InodeCaches.
This should add no overhead at all on unix. Indeed, I sped up a few
things slightly in the refactoring.
Seems to basically work! But it has a big known problem:
If the timezone changes while the assistant (or a long-running command)
runs, it won't notice, since it only checks the inode cache once, and
so will use the old delta for all new inode caches it generates for new
files it's added. Which will result in them seeming changed the next time
it runs.
This commit was sponsored by Vincent Demeester.
2014-06-11 21:51:12 +00:00
|
|
|
|
, sentinalstatus :: Maybe SentinalStatus
|
2013-09-28 18:35:21 +00:00
|
|
|
|
, useragent :: Maybe String
|
fix inversion of control in CommandSeek (no behavior changes)
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.
2014-01-20 08:11:42 +00:00
|
|
|
|
, errcounter :: Integer
|
2020-11-16 18:09:55 +00:00
|
|
|
|
, adjustedbranchrefreshcounter :: Integer
|
2014-01-22 20:35:32 +00:00
|
|
|
|
, unusedkeys :: Maybe (S.Set Key)
|
2014-12-08 23:14:24 +00:00
|
|
|
|
, tempurls :: M.Map Key URLString
|
2014-03-02 22:01:07 +00:00
|
|
|
|
, existinghooks :: M.Map Git.Hook.Hook Bool
|
2014-03-22 14:42:38 +00:00
|
|
|
|
, desktopnotify :: DesktopNotify
|
2019-06-19 19:47:54 +00:00
|
|
|
|
, workers :: Maybe (TMVar (WorkerPool AnnexState))
|
2017-10-17 21:54:38 +00:00
|
|
|
|
, activekeys :: TVar (M.Map Key ThreadId)
|
2017-03-08 18:49:30 +00:00
|
|
|
|
, activeremotes :: MVar (M.Map (Types.Remote.RemoteA Annex) Integer)
|
2020-04-17 21:09:29 +00:00
|
|
|
|
, keysdbhandle :: Keys.DbHandle
|
2018-10-19 19:17:48 +00:00
|
|
|
|
, cachedcurrentbranch :: (Maybe (Maybe Git.Branch, Maybe Adjustment))
|
2020-04-10 17:37:04 +00:00
|
|
|
|
, cachedgitenv :: Maybe (AltIndexFile, FilePath, [(String, String)])
|
2018-04-04 19:00:51 +00:00
|
|
|
|
, urloptions :: Maybe UrlOptions
|
2020-06-18 16:56:29 +00:00
|
|
|
|
, insmudgecleanfilter :: Bool
|
2020-12-07 17:08:59 +00:00
|
|
|
|
, transferrerpool :: TransferrerPool
|
2011-04-16 20:41:46 +00:00
|
|
|
|
}
|
2011-01-26 04:17:38 +00:00
|
|
|
|
|
2016-09-06 16:42:50 +00:00
|
|
|
|
newState :: GitConfig -> Git.Repo -> IO AnnexState
|
|
|
|
|
newState c r = do
|
2017-03-08 18:49:30 +00:00
|
|
|
|
emptyactiveremotes <- newMVar M.empty
|
2017-10-17 21:54:38 +00:00
|
|
|
|
emptyactivekeys <- newTVarIO M.empty
|
2017-05-11 21:33:18 +00:00
|
|
|
|
o <- newMessageState
|
2017-05-11 22:29:51 +00:00
|
|
|
|
sc <- newTMVarIO False
|
2020-04-17 21:09:29 +00:00
|
|
|
|
kh <- Keys.newDbHandle
|
2020-12-07 17:08:59 +00:00
|
|
|
|
tp <- newTransferrerPool
|
2016-09-06 16:42:50 +00:00
|
|
|
|
return $ AnnexState
|
|
|
|
|
{ repo = r
|
|
|
|
|
, repoadjustment = return
|
|
|
|
|
, gitconfig = c
|
2020-02-27 04:52:37 +00:00
|
|
|
|
, gitconfigadjustment = id
|
2018-01-09 19:36:56 +00:00
|
|
|
|
, gitremotes = Nothing
|
2017-05-09 19:04:07 +00:00
|
|
|
|
, backend = Nothing
|
2016-09-06 16:42:50 +00:00
|
|
|
|
, remotes = []
|
2017-05-11 21:33:18 +00:00
|
|
|
|
, output = o
|
2020-09-16 15:41:28 +00:00
|
|
|
|
, concurrency = ConcurrencyCmdLine NonConcurrent
|
2016-09-06 16:42:50 +00:00
|
|
|
|
, force = False
|
|
|
|
|
, fast = False
|
|
|
|
|
, daemon = False
|
|
|
|
|
, branchstate = startBranchState
|
|
|
|
|
, repoqueue = Nothing
|
2020-04-20 17:53:27 +00:00
|
|
|
|
, catfilehandles = catFileHandlesNonConcurrent
|
2016-09-06 16:42:50 +00:00
|
|
|
|
, hashobjecthandle = Nothing
|
|
|
|
|
, checkattrhandle = Nothing
|
|
|
|
|
, checkignorehandle = Nothing
|
|
|
|
|
, forcebackend = Nothing
|
|
|
|
|
, globalnumcopies = Nothing
|
|
|
|
|
, forcenumcopies = Nothing
|
|
|
|
|
, limit = BuildingMatcher []
|
2019-01-01 19:39:45 +00:00
|
|
|
|
, uuiddescmap = Nothing
|
2016-09-06 16:42:50 +00:00
|
|
|
|
, preferredcontentmap = Nothing
|
|
|
|
|
, requiredcontentmap = Nothing
|
2020-09-22 17:52:26 +00:00
|
|
|
|
, remoteconfigmap = Nothing
|
2016-09-06 16:42:50 +00:00
|
|
|
|
, forcetrust = M.empty
|
|
|
|
|
, trustmap = Nothing
|
|
|
|
|
, groupmap = Nothing
|
|
|
|
|
, ciphers = M.empty
|
|
|
|
|
, lockcache = M.empty
|
2017-05-11 21:33:18 +00:00
|
|
|
|
, sshstalecleaned = sc
|
2016-09-06 16:42:50 +00:00
|
|
|
|
, flags = M.empty
|
|
|
|
|
, fields = M.empty
|
|
|
|
|
, cleanup = M.empty
|
|
|
|
|
, sentinalstatus = Nothing
|
|
|
|
|
, useragent = Nothing
|
|
|
|
|
, errcounter = 0
|
2020-11-16 18:09:55 +00:00
|
|
|
|
, adjustedbranchrefreshcounter = 0
|
2016-09-06 16:42:50 +00:00
|
|
|
|
, unusedkeys = Nothing
|
|
|
|
|
, tempurls = M.empty
|
|
|
|
|
, existinghooks = M.empty
|
|
|
|
|
, desktopnotify = mempty
|
2019-06-19 19:47:54 +00:00
|
|
|
|
, workers = Nothing
|
2017-10-17 21:54:38 +00:00
|
|
|
|
, activekeys = emptyactivekeys
|
2016-09-06 16:42:50 +00:00
|
|
|
|
, activeremotes = emptyactiveremotes
|
2020-04-17 21:09:29 +00:00
|
|
|
|
, keysdbhandle = kh
|
2016-09-06 16:42:50 +00:00
|
|
|
|
, cachedcurrentbranch = Nothing
|
2016-09-29 17:36:48 +00:00
|
|
|
|
, cachedgitenv = Nothing
|
2018-04-04 19:00:51 +00:00
|
|
|
|
, urloptions = Nothing
|
2020-06-18 16:56:29 +00:00
|
|
|
|
, insmudgecleanfilter = False
|
2020-12-07 17:08:59 +00:00
|
|
|
|
, transferrerpool = tp
|
2016-09-06 16:42:50 +00:00
|
|
|
|
}
|
2010-10-14 07:18:11 +00:00
|
|
|
|
|
2012-05-18 22:20:53 +00:00
|
|
|
|
{- Makes an Annex state object for the specified git repo.
|
2015-03-02 20:43:44 +00:00
|
|
|
|
- Ensures the config is read, if it was not already, and performs
|
|
|
|
|
- any necessary git repo fixups. -}
|
2011-07-05 22:31:46 +00:00
|
|
|
|
new :: Git.Repo -> IO AnnexState
|
2013-11-26 22:11:37 +00:00
|
|
|
|
new r = do
|
2015-01-06 19:31:24 +00:00
|
|
|
|
r' <- Git.Config.read =<< Git.relPath r
|
git-annex config annex.largefiles
annex.largefiles can be configured by git-annex config, to more easily set
a default that will also be used by clones, without needing to shoehorn the
expression into the gitattributes file. The git config and gitattributes
override that.
Whenever something is added to git-annex config, we have to consider what
happens if a user puts a purposfully bad value in there. Or, if a new
git-annex adds some new value that an old git-annex can't parse.
In this case, a global annex.largefiles that can't be parsed currently
makes an error be thrown. That might not be ideal, but the gitattribute
behaves the same, and is almost equally repo-global.
Performance notes:
git-annex add and addurl construct a matcher once
and uses it for every file, so the added time penalty for reading the global
config log is minor. If the gitattributes annex.largefiles were deprecated,
git-annex add would get around 2% faster (excluding hashing), because
looking that up for each file is not fast. So this new way of setting
it is progress toward speeding up add.
git-annex smudge does need to load the log every time. As well as checking
the git attribute. Not ideal. Setting annex.gitaddtoannex=false avoids
both overheads.
2019-12-20 16:12:31 +00:00
|
|
|
|
let c = extractGitConfig FromGitConfig r'
|
2016-09-06 16:42:50 +00:00
|
|
|
|
newState c =<< fixupRepo r' c
|
2010-10-14 07:18:11 +00:00
|
|
|
|
|
Switch to MonadCatchIO-transformers for better handling of state while catching exceptions.
As seen in this bug report, the lifted exception handling using the StateT
monad throws away state changes when an action throws an exception.
http://git-annex.branchable.com/bugs/git_annex_fork_bombs_on_gpg_file/
.. Which can result in cached values being redundantly calculated, or other
possibly worse bugs when the annex state gets out of sync with reality.
This switches from a StateT AnnexState to a ReaderT (MVar AnnexState).
All changes to the state go via the MVar. So when an Annex action is
running inside an exception handler, and it makes some changes, they
immediately go into affect in the MVar. If it then throws an exception
(or even crashes its thread!), the state changes are still in effect.
The MonadCatchIO-transformers change is actually only incidental.
I could have kept on using lifted-base for the exception handling.
However, I'd have needed to write a new instance of MonadBaseControl
for the new monad.. and I didn't write the old instance.. I begged Bas
and he kindly sent it to me. Happily, MonadCatchIO-transformers is
able to derive a MonadCatchIO instance for my monad.
This is a deep level change. It passes the test suite! What could it break?
Well.. The most likely breakage would be to code that runs an Annex action
in an exception handler, and *wants* state changes to be thrown away.
Perhaps the state changes leaves the state inconsistent, or wrong. Since
there are relatively few places in git-annex that catch exceptions in the
Annex monad, and the AnnexState is generally just used to cache calculated
data, this is unlikely to be a problem.
Oh yeah, this change also makes Assistant.Types.ThreadedMonad a bit
redundant. It's now entirely possible to run concurrent Annex actions in
different threads, all sharing access to the same state! The ThreadedMonad
just adds some extra work on top of that, with its own MVar, and avoids
such actions possibly stepping on one-another's toes. I have not gotten
rid of it, but might try that later. Being able to run concurrent Annex
actions would simplify parts of the Assistant code.
2013-05-19 18:16:36 +00:00
|
|
|
|
{- Performs an action in the Annex monad from a starting state,
|
|
|
|
|
- returning a new state. -}
|
2011-01-11 22:13:26 +00:00
|
|
|
|
run :: AnnexState -> Annex a -> IO (a, AnnexState)
|
2015-12-23 22:34:51 +00:00
|
|
|
|
run s a = flip run' a =<< newMVar s
|
|
|
|
|
|
|
|
|
|
run' :: MVar AnnexState -> Annex a -> IO (a, AnnexState)
|
|
|
|
|
run' mvar a = do
|
Switch to MonadCatchIO-transformers for better handling of state while catching exceptions.
As seen in this bug report, the lifted exception handling using the StateT
monad throws away state changes when an action throws an exception.
http://git-annex.branchable.com/bugs/git_annex_fork_bombs_on_gpg_file/
.. Which can result in cached values being redundantly calculated, or other
possibly worse bugs when the annex state gets out of sync with reality.
This switches from a StateT AnnexState to a ReaderT (MVar AnnexState).
All changes to the state go via the MVar. So when an Annex action is
running inside an exception handler, and it makes some changes, they
immediately go into affect in the MVar. If it then throws an exception
(or even crashes its thread!), the state changes are still in effect.
The MonadCatchIO-transformers change is actually only incidental.
I could have kept on using lifted-base for the exception handling.
However, I'd have needed to write a new instance of MonadBaseControl
for the new monad.. and I didn't write the old instance.. I begged Bas
and he kindly sent it to me. Happily, MonadCatchIO-transformers is
able to derive a MonadCatchIO instance for my monad.
This is a deep level change. It passes the test suite! What could it break?
Well.. The most likely breakage would be to code that runs an Annex action
in an exception handler, and *wants* state changes to be thrown away.
Perhaps the state changes leaves the state inconsistent, or wrong. Since
there are relatively few places in git-annex that catch exceptions in the
Annex monad, and the AnnexState is generally just used to cache calculated
data, this is unlikely to be a problem.
Oh yeah, this change also makes Assistant.Types.ThreadedMonad a bit
redundant. It's now entirely possible to run concurrent Annex actions in
different threads, all sharing access to the same state! The ThreadedMonad
just adds some extra work on top of that, with its own MVar, and avoids
such actions possibly stepping on one-another's toes. I have not gotten
rid of it, but might try that later. Being able to run concurrent Annex
actions would simplify parts of the Assistant code.
2013-05-19 18:16:36 +00:00
|
|
|
|
r <- runReaderT (runAnnex a) mvar
|
2015-12-23 23:38:18 +00:00
|
|
|
|
`onException` (flush =<< readMVar mvar)
|
Switch to MonadCatchIO-transformers for better handling of state while catching exceptions.
As seen in this bug report, the lifted exception handling using the StateT
monad throws away state changes when an action throws an exception.
http://git-annex.branchable.com/bugs/git_annex_fork_bombs_on_gpg_file/
.. Which can result in cached values being redundantly calculated, or other
possibly worse bugs when the annex state gets out of sync with reality.
This switches from a StateT AnnexState to a ReaderT (MVar AnnexState).
All changes to the state go via the MVar. So when an Annex action is
running inside an exception handler, and it makes some changes, they
immediately go into affect in the MVar. If it then throws an exception
(or even crashes its thread!), the state changes are still in effect.
The MonadCatchIO-transformers change is actually only incidental.
I could have kept on using lifted-base for the exception handling.
However, I'd have needed to write a new instance of MonadBaseControl
for the new monad.. and I didn't write the old instance.. I begged Bas
and he kindly sent it to me. Happily, MonadCatchIO-transformers is
able to derive a MonadCatchIO instance for my monad.
This is a deep level change. It passes the test suite! What could it break?
Well.. The most likely breakage would be to code that runs an Annex action
in an exception handler, and *wants* state changes to be thrown away.
Perhaps the state changes leaves the state inconsistent, or wrong. Since
there are relatively few places in git-annex that catch exceptions in the
Annex monad, and the AnnexState is generally just used to cache calculated
data, this is unlikely to be a problem.
Oh yeah, this change also makes Assistant.Types.ThreadedMonad a bit
redundant. It's now entirely possible to run concurrent Annex actions in
different threads, all sharing access to the same state! The ThreadedMonad
just adds some extra work on top of that, with its own MVar, and avoids
such actions possibly stepping on one-another's toes. I have not gotten
rid of it, but might try that later. Being able to run concurrent Annex
actions would simplify parts of the Assistant code.
2013-05-19 18:16:36 +00:00
|
|
|
|
s' <- takeMVar mvar
|
2015-12-23 23:38:18 +00:00
|
|
|
|
flush s'
|
Switch to MonadCatchIO-transformers for better handling of state while catching exceptions.
As seen in this bug report, the lifted exception handling using the StateT
monad throws away state changes when an action throws an exception.
http://git-annex.branchable.com/bugs/git_annex_fork_bombs_on_gpg_file/
.. Which can result in cached values being redundantly calculated, or other
possibly worse bugs when the annex state gets out of sync with reality.
This switches from a StateT AnnexState to a ReaderT (MVar AnnexState).
All changes to the state go via the MVar. So when an Annex action is
running inside an exception handler, and it makes some changes, they
immediately go into affect in the MVar. If it then throws an exception
(or even crashes its thread!), the state changes are still in effect.
The MonadCatchIO-transformers change is actually only incidental.
I could have kept on using lifted-base for the exception handling.
However, I'd have needed to write a new instance of MonadBaseControl
for the new monad.. and I didn't write the old instance.. I begged Bas
and he kindly sent it to me. Happily, MonadCatchIO-transformers is
able to derive a MonadCatchIO instance for my monad.
This is a deep level change. It passes the test suite! What could it break?
Well.. The most likely breakage would be to code that runs an Annex action
in an exception handler, and *wants* state changes to be thrown away.
Perhaps the state changes leaves the state inconsistent, or wrong. Since
there are relatively few places in git-annex that catch exceptions in the
Annex monad, and the AnnexState is generally just used to cache calculated
data, this is unlikely to be a problem.
Oh yeah, this change also makes Assistant.Types.ThreadedMonad a bit
redundant. It's now entirely possible to run concurrent Annex actions in
different threads, all sharing access to the same state! The ThreadedMonad
just adds some extra work on top of that, with its own MVar, and avoids
such actions possibly stepping on one-another's toes. I have not gotten
rid of it, but might try that later. Being able to run concurrent Annex
actions would simplify parts of the Assistant code.
2013-05-19 18:16:36 +00:00
|
|
|
|
return (r, s')
|
2015-12-23 23:38:18 +00:00
|
|
|
|
where
|
2020-04-17 21:09:29 +00:00
|
|
|
|
flush = Keys.flushDbQueue . keysdbhandle
|
Switch to MonadCatchIO-transformers for better handling of state while catching exceptions.
As seen in this bug report, the lifted exception handling using the StateT
monad throws away state changes when an action throws an exception.
http://git-annex.branchable.com/bugs/git_annex_fork_bombs_on_gpg_file/
.. Which can result in cached values being redundantly calculated, or other
possibly worse bugs when the annex state gets out of sync with reality.
This switches from a StateT AnnexState to a ReaderT (MVar AnnexState).
All changes to the state go via the MVar. So when an Annex action is
running inside an exception handler, and it makes some changes, they
immediately go into affect in the MVar. If it then throws an exception
(or even crashes its thread!), the state changes are still in effect.
The MonadCatchIO-transformers change is actually only incidental.
I could have kept on using lifted-base for the exception handling.
However, I'd have needed to write a new instance of MonadBaseControl
for the new monad.. and I didn't write the old instance.. I begged Bas
and he kindly sent it to me. Happily, MonadCatchIO-transformers is
able to derive a MonadCatchIO instance for my monad.
This is a deep level change. It passes the test suite! What could it break?
Well.. The most likely breakage would be to code that runs an Annex action
in an exception handler, and *wants* state changes to be thrown away.
Perhaps the state changes leaves the state inconsistent, or wrong. Since
there are relatively few places in git-annex that catch exceptions in the
Annex monad, and the AnnexState is generally just used to cache calculated
data, this is unlikely to be a problem.
Oh yeah, this change also makes Assistant.Types.ThreadedMonad a bit
redundant. It's now entirely possible to run concurrent Annex actions in
different threads, all sharing access to the same state! The ThreadedMonad
just adds some extra work on top of that, with its own MVar, and avoids
such actions possibly stepping on one-another's toes. I have not gotten
rid of it, but might try that later. Being able to run concurrent Annex
actions would simplify parts of the Assistant code.
2013-05-19 18:16:36 +00:00
|
|
|
|
|
|
|
|
|
{- Performs an action in the Annex monad from a starting state,
|
|
|
|
|
- and throws away the new state. -}
|
2011-01-11 22:13:26 +00:00
|
|
|
|
eval :: AnnexState -> Annex a -> IO a
|
2015-12-23 22:34:51 +00:00
|
|
|
|
eval s a = fst <$> run s a
|
Switch to MonadCatchIO-transformers for better handling of state while catching exceptions.
As seen in this bug report, the lifted exception handling using the StateT
monad throws away state changes when an action throws an exception.
http://git-annex.branchable.com/bugs/git_annex_fork_bombs_on_gpg_file/
.. Which can result in cached values being redundantly calculated, or other
possibly worse bugs when the annex state gets out of sync with reality.
This switches from a StateT AnnexState to a ReaderT (MVar AnnexState).
All changes to the state go via the MVar. So when an Annex action is
running inside an exception handler, and it makes some changes, they
immediately go into affect in the MVar. If it then throws an exception
(or even crashes its thread!), the state changes are still in effect.
The MonadCatchIO-transformers change is actually only incidental.
I could have kept on using lifted-base for the exception handling.
However, I'd have needed to write a new instance of MonadBaseControl
for the new monad.. and I didn't write the old instance.. I begged Bas
and he kindly sent it to me. Happily, MonadCatchIO-transformers is
able to derive a MonadCatchIO instance for my monad.
This is a deep level change. It passes the test suite! What could it break?
Well.. The most likely breakage would be to code that runs an Annex action
in an exception handler, and *wants* state changes to be thrown away.
Perhaps the state changes leaves the state inconsistent, or wrong. Since
there are relatively few places in git-annex that catch exceptions in the
Annex monad, and the AnnexState is generally just used to cache calculated
data, this is unlikely to be a problem.
Oh yeah, this change also makes Assistant.Types.ThreadedMonad a bit
redundant. It's now entirely possible to run concurrent Annex actions in
different threads, all sharing access to the same state! The ThreadedMonad
just adds some extra work on top of that, with its own MVar, and avoids
such actions possibly stepping on one-another's toes. I have not gotten
rid of it, but might try that later. Being able to run concurrent Annex
actions would simplify parts of the Assistant code.
2013-05-19 18:16:36 +00:00
|
|
|
|
|
2015-10-09 17:35:28 +00:00
|
|
|
|
{- Makes a runner action, that allows diving into IO and from inside
|
|
|
|
|
- the IO action, running an Annex action. -}
|
|
|
|
|
makeRunner :: Annex (Annex a -> IO a)
|
|
|
|
|
makeRunner = do
|
|
|
|
|
mvar <- ask
|
2015-12-23 23:38:18 +00:00
|
|
|
|
return $ \a -> do
|
|
|
|
|
(r, s) <- run' mvar a
|
|
|
|
|
putMVar mvar s
|
|
|
|
|
return r
|
2015-10-09 17:35:28 +00:00
|
|
|
|
|
Switch to MonadCatchIO-transformers for better handling of state while catching exceptions.
As seen in this bug report, the lifted exception handling using the StateT
monad throws away state changes when an action throws an exception.
http://git-annex.branchable.com/bugs/git_annex_fork_bombs_on_gpg_file/
.. Which can result in cached values being redundantly calculated, or other
possibly worse bugs when the annex state gets out of sync with reality.
This switches from a StateT AnnexState to a ReaderT (MVar AnnexState).
All changes to the state go via the MVar. So when an Annex action is
running inside an exception handler, and it makes some changes, they
immediately go into affect in the MVar. If it then throws an exception
(or even crashes its thread!), the state changes are still in effect.
The MonadCatchIO-transformers change is actually only incidental.
I could have kept on using lifted-base for the exception handling.
However, I'd have needed to write a new instance of MonadBaseControl
for the new monad.. and I didn't write the old instance.. I begged Bas
and he kindly sent it to me. Happily, MonadCatchIO-transformers is
able to derive a MonadCatchIO instance for my monad.
This is a deep level change. It passes the test suite! What could it break?
Well.. The most likely breakage would be to code that runs an Annex action
in an exception handler, and *wants* state changes to be thrown away.
Perhaps the state changes leaves the state inconsistent, or wrong. Since
there are relatively few places in git-annex that catch exceptions in the
Annex monad, and the AnnexState is generally just used to cache calculated
data, this is unlikely to be a problem.
Oh yeah, this change also makes Assistant.Types.ThreadedMonad a bit
redundant. It's now entirely possible to run concurrent Annex actions in
different threads, all sharing access to the same state! The ThreadedMonad
just adds some extra work on top of that, with its own MVar, and avoids
such actions possibly stepping on one-another's toes. I have not gotten
rid of it, but might try that later. Being able to run concurrent Annex
actions would simplify parts of the Assistant code.
2013-05-19 18:16:36 +00:00
|
|
|
|
getState :: (AnnexState -> v) -> Annex v
|
|
|
|
|
getState selector = do
|
|
|
|
|
mvar <- ask
|
|
|
|
|
s <- liftIO $ readMVar mvar
|
|
|
|
|
return $ selector s
|
|
|
|
|
|
|
|
|
|
changeState :: (AnnexState -> AnnexState) -> Annex ()
|
|
|
|
|
changeState modifier = do
|
|
|
|
|
mvar <- ask
|
|
|
|
|
liftIO $ modifyMVar_ mvar $ return . modifier
|
2010-10-14 07:18:11 +00:00
|
|
|
|
|
2016-09-29 17:36:48 +00:00
|
|
|
|
withState :: (AnnexState -> IO (AnnexState, b)) -> Annex b
|
2014-08-20 16:01:45 +00:00
|
|
|
|
withState modifier = do
|
|
|
|
|
mvar <- ask
|
2016-09-29 17:36:48 +00:00
|
|
|
|
liftIO $ modifyMVar mvar modifier
|
2014-08-20 16:01:45 +00:00
|
|
|
|
|
more command-specific options
Made --from and --to command-specific options.
Added generic storage for values of command-specific options,
which allows removing some of the special case fields in AnnexState.
(Also added generic storage for command-specific flags, although there are
not yet any.)
Note that this storage uses a Map, so repeatedly looking up the same value
is slightly more expensive than looking up an AnnexState field. But, the
value can be looked up once in the seek stage, transformed as necessary,
and passed in a closure to the start stage, and this avoids that overhead.
Still, I'm hesitant to use this for things like force or fast flags.
It's probably best to reserve it for flags that are only used by a few
commands, or options like --from and --to that it's important only be
allowed to be used with commands that implement them, to avoid user
confusion.
2012-01-06 07:06:25 +00:00
|
|
|
|
{- Sets a flag to True -}
|
|
|
|
|
setFlag :: String -> Annex ()
|
|
|
|
|
setFlag flag = changeState $ \s ->
|
2018-04-22 17:28:31 +00:00
|
|
|
|
s { flags = M.insert flag True $ flags s }
|
more command-specific options
Made --from and --to command-specific options.
Added generic storage for values of command-specific options,
which allows removing some of the special case fields in AnnexState.
(Also added generic storage for command-specific flags, although there are
not yet any.)
Note that this storage uses a Map, so repeatedly looking up the same value
is slightly more expensive than looking up an AnnexState field. But, the
value can be looked up once in the seek stage, transformed as necessary,
and passed in a closure to the start stage, and this avoids that overhead.
Still, I'm hesitant to use this for things like force or fast flags.
It's probably best to reserve it for flags that are only used by a few
commands, or options like --from and --to that it's important only be
allowed to be used with commands that implement them, to avoid user
confusion.
2012-01-06 07:06:25 +00:00
|
|
|
|
|
|
|
|
|
{- Sets a field to a value -}
|
|
|
|
|
setField :: String -> String -> Annex ()
|
|
|
|
|
setField field value = changeState $ \s ->
|
2018-04-22 17:28:31 +00:00
|
|
|
|
s { fields = M.insert field value $ fields s }
|
2012-02-25 22:02:49 +00:00
|
|
|
|
|
|
|
|
|
{- Adds a cleanup action to perform. -}
|
2014-03-13 23:06:26 +00:00
|
|
|
|
addCleanup :: CleanupAction -> Annex () -> Annex ()
|
|
|
|
|
addCleanup k a = changeState $ \s ->
|
2018-04-22 17:28:31 +00:00
|
|
|
|
s { cleanup = M.insert k a $ cleanup s }
|
more command-specific options
Made --from and --to command-specific options.
Added generic storage for values of command-specific options,
which allows removing some of the special case fields in AnnexState.
(Also added generic storage for command-specific flags, although there are
not yet any.)
Note that this storage uses a Map, so repeatedly looking up the same value
is slightly more expensive than looking up an AnnexState field. But, the
value can be looked up once in the seek stage, transformed as necessary,
and passed in a closure to the start stage, and this avoids that overhead.
Still, I'm hesitant to use this for things like force or fast flags.
It's probably best to reserve it for flags that are only used by a few
commands, or options like --from and --to that it's important only be
allowed to be used with commands that implement them, to avoid user
confusion.
2012-01-06 07:06:25 +00:00
|
|
|
|
|
2012-04-30 17:59:05 +00:00
|
|
|
|
{- Sets the type of output to emit. -}
|
|
|
|
|
setOutput :: OutputType -> Annex ()
|
|
|
|
|
setOutput o = changeState $ \s ->
|
2018-02-19 18:03:23 +00:00
|
|
|
|
let m = output s
|
|
|
|
|
in s { output = m { outputType = adjustOutputType (outputType m) o } }
|
2012-04-30 17:59:05 +00:00
|
|
|
|
|
more command-specific options
Made --from and --to command-specific options.
Added generic storage for values of command-specific options,
which allows removing some of the special case fields in AnnexState.
(Also added generic storage for command-specific flags, although there are
not yet any.)
Note that this storage uses a Map, so repeatedly looking up the same value
is slightly more expensive than looking up an AnnexState field. But, the
value can be looked up once in the seek stage, transformed as necessary,
and passed in a closure to the start stage, and this avoids that overhead.
Still, I'm hesitant to use this for things like force or fast flags.
It's probably best to reserve it for flags that are only used by a few
commands, or options like --from and --to that it's important only be
allowed to be used with commands that implement them, to avoid user
confusion.
2012-01-06 07:06:25 +00:00
|
|
|
|
{- Checks if a flag was set. -}
|
|
|
|
|
getFlag :: String -> Annex Bool
|
|
|
|
|
getFlag flag = fromMaybe False . M.lookup flag <$> getState flags
|
|
|
|
|
|
|
|
|
|
{- Gets the value of a field. -}
|
|
|
|
|
getField :: String -> Annex (Maybe String)
|
|
|
|
|
getField field = M.lookup field <$> getState fields
|
|
|
|
|
|
2011-11-08 19:34:10 +00:00
|
|
|
|
{- Returns the annex's git repository. -}
|
2010-10-14 07:18:11 +00:00
|
|
|
|
gitRepo :: Annex Git.Repo
|
2011-01-26 01:49:04 +00:00
|
|
|
|
gitRepo = getState repo
|
2011-11-08 19:34:10 +00:00
|
|
|
|
|
|
|
|
|
{- Runs an IO action in the annex's git repository. -}
|
|
|
|
|
inRepo :: (Git.Repo -> IO a) -> Annex a
|
2011-11-12 18:24:07 +00:00
|
|
|
|
inRepo a = liftIO . a =<< gitRepo
|
2011-11-08 19:34:10 +00:00
|
|
|
|
|
|
|
|
|
{- Extracts a value from the annex's git repisitory. -}
|
|
|
|
|
fromRepo :: (Git.Repo -> a) -> Annex a
|
|
|
|
|
fromRepo a = a <$> gitRepo
|
2012-12-30 03:10:18 +00:00
|
|
|
|
|
Switch to MonadCatchIO-transformers for better handling of state while catching exceptions.
As seen in this bug report, the lifted exception handling using the StateT
monad throws away state changes when an action throws an exception.
http://git-annex.branchable.com/bugs/git_annex_fork_bombs_on_gpg_file/
.. Which can result in cached values being redundantly calculated, or other
possibly worse bugs when the annex state gets out of sync with reality.
This switches from a StateT AnnexState to a ReaderT (MVar AnnexState).
All changes to the state go via the MVar. So when an Annex action is
running inside an exception handler, and it makes some changes, they
immediately go into affect in the MVar. If it then throws an exception
(or even crashes its thread!), the state changes are still in effect.
The MonadCatchIO-transformers change is actually only incidental.
I could have kept on using lifted-base for the exception handling.
However, I'd have needed to write a new instance of MonadBaseControl
for the new monad.. and I didn't write the old instance.. I begged Bas
and he kindly sent it to me. Happily, MonadCatchIO-transformers is
able to derive a MonadCatchIO instance for my monad.
This is a deep level change. It passes the test suite! What could it break?
Well.. The most likely breakage would be to code that runs an Annex action
in an exception handler, and *wants* state changes to be thrown away.
Perhaps the state changes leaves the state inconsistent, or wrong. Since
there are relatively few places in git-annex that catch exceptions in the
Annex monad, and the AnnexState is generally just used to cache calculated
data, this is unlikely to be a problem.
Oh yeah, this change also makes Assistant.Types.ThreadedMonad a bit
redundant. It's now entirely possible to run concurrent Annex actions in
different threads, all sharing access to the same state! The ThreadedMonad
just adds some extra work on top of that, with its own MVar, and avoids
such actions possibly stepping on one-another's toes. I have not gotten
rid of it, but might try that later. Being able to run concurrent Annex
actions would simplify parts of the Assistant code.
2013-05-19 18:16:36 +00:00
|
|
|
|
{- Calculates a value from an annex's git repository and its GitConfig. -}
|
2013-04-04 19:46:33 +00:00
|
|
|
|
calcRepo :: (Git.Repo -> GitConfig -> IO a) -> Annex a
|
|
|
|
|
calcRepo a = do
|
|
|
|
|
s <- getState id
|
|
|
|
|
liftIO $ a (repo s) (gitconfig s)
|
|
|
|
|
|
2013-01-01 17:52:47 +00:00
|
|
|
|
{- Gets the GitConfig settings. -}
|
|
|
|
|
getGitConfig :: Annex GitConfig
|
|
|
|
|
getGitConfig = getState gitconfig
|
2012-12-30 03:10:18 +00:00
|
|
|
|
|
rename changeGitConfig to overrideGitConfig and avoid unncessary calls
It's important that it be clear that it overrides a config, such that
reloading the git config won't change it, and in particular, setConfig
won't change it.
Most of the calls to changeGitConfig were actually after setConfig,
which was redundant and unncessary. So removed those.
The only remaining one, besides --debug, is in the handling of
repository-global config values. That one's ok, because the
way mergeGitConfig is implemented, it does not override any value that
is set in git config. If a value with a repo-global setting was passed
to setConfig, it would set it in the git config, reload the git config,
re-apply mergeGitConfig, and use the newly set value, which is the right
thing.
2020-02-27 05:06:35 +00:00
|
|
|
|
{- Overrides a GitConfig setting. The modification persists across
|
2020-02-27 04:52:37 +00:00
|
|
|
|
- reloads of the repo's config. -}
|
rename changeGitConfig to overrideGitConfig and avoid unncessary calls
It's important that it be clear that it overrides a config, such that
reloading the git config won't change it, and in particular, setConfig
won't change it.
Most of the calls to changeGitConfig were actually after setConfig,
which was redundant and unncessary. So removed those.
The only remaining one, besides --debug, is in the handling of
repository-global config values. That one's ok, because the
way mergeGitConfig is implemented, it does not override any value that
is set in git config. If a value with a repo-global setting was passed
to setConfig, it would set it in the git config, reload the git config,
re-apply mergeGitConfig, and use the newly set value, which is the right
thing.
2020-02-27 05:06:35 +00:00
|
|
|
|
overrideGitConfig :: (GitConfig -> GitConfig) -> Annex ()
|
|
|
|
|
overrideGitConfig f = changeState $ \s -> s
|
2020-02-27 04:52:37 +00:00
|
|
|
|
{ gitconfigadjustment = gitconfigadjustment s . f
|
|
|
|
|
, gitconfig = f (gitconfig s)
|
|
|
|
|
}
|
2016-01-22 17:47:41 +00:00
|
|
|
|
|
|
|
|
|
{- Adds an adjustment to the Repo data. Adjustments persist across reloads
|
2020-03-16 17:06:44 +00:00
|
|
|
|
- of the repo's config.
|
|
|
|
|
-
|
|
|
|
|
- Note that the action may run more than once, and should avoid eg,
|
|
|
|
|
- appending the same value to a repo's config when run repeatedly.
|
|
|
|
|
-}
|
2016-01-22 17:47:41 +00:00
|
|
|
|
adjustGitRepo :: (Git.Repo -> IO Git.Repo) -> Annex ()
|
|
|
|
|
adjustGitRepo a = do
|
|
|
|
|
changeState $ \s -> s { repoadjustment = \r -> repoadjustment s r >>= a }
|
|
|
|
|
changeGitRepo =<< gitRepo
|
2013-03-12 20:41:54 +00:00
|
|
|
|
|
refix bug in a better way
Always run Git.Config.store, so when the git config gets reloaded,
the override gets re-added to it, and changeGitRepo then calls extractGitConfig
on it and sees the annex.* settings from the override.
Remove any prior occurance of -c v and add it to the end. This way,
-c foo=1 -c foo=2 -c foo=1 will pass -c foo=1 to git, rather than -c foo=2
Note that, if git had some multiline config that got built up by
multiple -c's, this would not work still. But it never worked because
before the bug got fixed in the first place, the -c value was repeated
many times, so the multivalue thing would have been wrong. I don't think
-c can be used with multiline configs anyway, though git-config does
talk about them?
2020-07-02 17:32:33 +00:00
|
|
|
|
{- Adds git config setting, like "foo=bar". It will be passed with -c
|
|
|
|
|
- to git processes. The config setting is also recorded in the repo,
|
|
|
|
|
- and the GitConfig is updated. -}
|
|
|
|
|
addGitConfigOverride :: String -> Annex ()
|
|
|
|
|
addGitConfigOverride v = adjustGitRepo $ \r ->
|
|
|
|
|
Git.Config.store (encodeBS' v) Git.Config.ConfigList $
|
|
|
|
|
r { Git.gitGlobalOpts = go (Git.gitGlobalOpts r) }
|
|
|
|
|
where
|
|
|
|
|
-- Remove any prior occurrance of the setting to avoid
|
|
|
|
|
-- building up many of them when the adjustment is run repeatedly,
|
|
|
|
|
-- and add the setting to the end.
|
|
|
|
|
go [] = [Param "-c", Param v]
|
|
|
|
|
go (Param "-c": Param v':rest) | v' == v = go rest
|
|
|
|
|
go (c:rest) = c : go rest
|
|
|
|
|
|
2020-02-27 04:52:37 +00:00
|
|
|
|
{- Changing the git Repo data also involves re-extracting its GitConfig. -}
|
|
|
|
|
changeGitRepo :: Git.Repo -> Annex ()
|
|
|
|
|
changeGitRepo r = do
|
|
|
|
|
repoadjuster <- getState repoadjustment
|
|
|
|
|
gitconfigadjuster <- getState gitconfigadjustment
|
|
|
|
|
r' <- liftIO $ repoadjuster r
|
|
|
|
|
changeState $ \s -> s
|
|
|
|
|
{ repo = r'
|
|
|
|
|
, gitconfig = gitconfigadjuster $
|
|
|
|
|
extractGitConfig FromGitConfig r'
|
|
|
|
|
}
|
|
|
|
|
|
2014-05-16 20:08:20 +00:00
|
|
|
|
{- Gets the RemoteGitConfig from a remote, given the Git.Repo for that
|
|
|
|
|
- remote. -}
|
|
|
|
|
getRemoteGitConfig :: Git.Repo -> Annex RemoteGitConfig
|
|
|
|
|
getRemoteGitConfig r = do
|
|
|
|
|
g <- gitRepo
|
2017-08-17 16:26:14 +00:00
|
|
|
|
liftIO $ atomically $ extractRemoteGitConfig g (Git.repoDescribe r)
|
2014-05-16 20:08:20 +00:00
|
|
|
|
|
2013-03-12 20:41:54 +00:00
|
|
|
|
{- Converts an Annex action into an IO action, that runs with a copy
|
|
|
|
|
- of the current Annex state.
|
|
|
|
|
-
|
|
|
|
|
- Use with caution; the action should not rely on changing the
|
|
|
|
|
- state, as it will be thrown away. -}
|
|
|
|
|
withCurrentState :: Annex a -> Annex (IO a)
|
|
|
|
|
withCurrentState a = do
|
|
|
|
|
s <- getState id
|
|
|
|
|
return $ eval s a
|
2015-01-07 02:23:04 +00:00
|
|
|
|
|
|
|
|
|
{- It's not safe to use setCurrentDirectory in the Annex monad,
|
|
|
|
|
- because the git repo paths are stored relative.
|
|
|
|
|
- Instead, use this.
|
|
|
|
|
-}
|
|
|
|
|
changeDirectory :: FilePath -> Annex ()
|
|
|
|
|
changeDirectory d = do
|
|
|
|
|
r <- liftIO . Git.adjustPath absPath =<< gitRepo
|
|
|
|
|
liftIO $ setCurrentDirectory d
|
|
|
|
|
r' <- liftIO $ Git.relPath r
|
|
|
|
|
changeState $ \s -> s { repo = r' }
|
2015-04-30 19:04:01 +00:00
|
|
|
|
|
|
|
|
|
incError :: Annex ()
|
|
|
|
|
incError = changeState $ \s ->
|
2020-11-16 18:09:55 +00:00
|
|
|
|
let !c = errcounter s + 1
|
|
|
|
|
!s' = s { errcounter = c }
|
2015-04-30 19:04:01 +00:00
|
|
|
|
in s'
|
2018-01-09 19:36:56 +00:00
|
|
|
|
|
|
|
|
|
getGitRemotes :: Annex [Git.Repo]
|
|
|
|
|
getGitRemotes = do
|
|
|
|
|
s <- getState id
|
|
|
|
|
case gitremotes s of
|
|
|
|
|
Just rs -> return rs
|
|
|
|
|
Nothing -> do
|
|
|
|
|
rs <- liftIO $ Git.Construct.fromRemotes (repo s)
|
|
|
|
|
changeState $ \s' -> s' { gitremotes = Just rs }
|
|
|
|
|
return rs
|