2012-08-22 18:32:17 +00:00
|
|
|
{- git-annex assistant repo syncing
|
|
|
|
-
|
|
|
|
- Copyright 2012 Joey Hess <joey@kitenet.net>
|
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
|
|
|
module Assistant.Sync where
|
|
|
|
|
|
|
|
import Assistant.Common
|
|
|
|
import Assistant.Pushes
|
2012-11-03 18:16:17 +00:00
|
|
|
import Assistant.NetMessager
|
|
|
|
import Assistant.Types.NetMessager
|
2012-08-22 18:32:17 +00:00
|
|
|
import Assistant.Alert
|
|
|
|
import Assistant.DaemonStatus
|
|
|
|
import Assistant.ScanRemotes
|
|
|
|
import qualified Command.Sync
|
|
|
|
import Utility.Parallel
|
|
|
|
import qualified Git
|
|
|
|
import qualified Git.Branch
|
2012-09-16 23:48:12 +00:00
|
|
|
import qualified Git.Ref
|
2012-08-22 18:32:17 +00:00
|
|
|
import qualified Git.Command
|
|
|
|
import qualified Remote
|
2012-09-04 19:54:30 +00:00
|
|
|
import qualified Types.Remote as Remote
|
2012-08-22 18:32:17 +00:00
|
|
|
import qualified Annex.Branch
|
2012-09-16 23:48:12 +00:00
|
|
|
import Annex.UUID
|
2012-08-22 18:32:17 +00:00
|
|
|
|
|
|
|
import Data.Time.Clock
|
|
|
|
import qualified Data.Map as M
|
2012-09-11 01:55:59 +00:00
|
|
|
import Control.Concurrent
|
2012-08-22 18:32:17 +00:00
|
|
|
|
|
|
|
{- Syncs with remotes that may have been disconnected for a while.
|
|
|
|
-
|
2012-08-23 19:22:23 +00:00
|
|
|
- First gets git in sync, and then prepares any necessary file transfers.
|
|
|
|
-
|
scan multiple remotes in one pass
The expensive transfer scan now scans a whole set of remotes in one pass.
So at startup, or when network comes up, it will run only once.
Note that this can result in transfers from/to higher cost remotes being
queued before other transfers of other content from/to lower cost remotes.
Before, low cost remotes were scanned first and all their transfers came
first. When multiple transfers are queued for a key, the lower cost ones
are still queued first. However, this could result in transfers from slow
remotes running for a long time while transfers of other data from faster
remotes waits.
I expect to make the transfer queue smarter about ordering
and/or make it allow multiple transfers at a time, which should eliminate
this annoyance. (Also, it was already possible to get into that situation,
for example if the network was up, lots of transfers from slow remotes
might be queued, and then a disk is mounted and its faster transfers have
to wait.)
Also note that this means I don't need to improve the code in
Assistant.Sync that currently checks if any of the reconnected remotes
have diverged, and if so, queues scans of all of them. That had been very
innefficient, but now doesn't matter.
2012-08-26 18:01:43 +00:00
|
|
|
- An expensive full scan is queued when the git-annex branches of some of
|
|
|
|
- the remotes have diverged from the local git-annex branch. Otherwise,
|
2012-08-23 19:22:23 +00:00
|
|
|
- it's sufficient to requeue failed transfers.
|
2012-08-22 18:32:17 +00:00
|
|
|
-}
|
2012-10-29 20:22:14 +00:00
|
|
|
reconnectRemotes :: Bool -> [Remote] -> Assistant ()
|
|
|
|
reconnectRemotes _ [] = noop
|
|
|
|
reconnectRemotes notifypushes rs = void $ do
|
2012-10-29 20:49:47 +00:00
|
|
|
alertWhile (syncAlert rs) $ do
|
2012-09-04 19:54:30 +00:00
|
|
|
(ok, diverged) <- sync
|
2012-10-29 20:22:14 +00:00
|
|
|
=<< liftAnnex (inRepo Git.Branch.current)
|
2012-10-29 23:14:30 +00:00
|
|
|
addScanRemotes diverged rs
|
2012-09-04 19:54:30 +00:00
|
|
|
return ok
|
2012-10-30 23:33:27 +00:00
|
|
|
where
|
|
|
|
gitremotes = filter (notspecialremote . Remote.repo) rs
|
|
|
|
notspecialremote r
|
|
|
|
| Git.repoIsUrl r = True
|
|
|
|
| Git.repoIsLocal r = True
|
|
|
|
| otherwise = False
|
|
|
|
sync (Just branch) = do
|
|
|
|
diverged <- snd <$> manualPull (Just branch) gitremotes
|
|
|
|
now <- liftIO getCurrentTime
|
|
|
|
ok <- pushToRemotes now notifypushes gitremotes
|
|
|
|
return (ok, diverged)
|
|
|
|
{- No local branch exists yet, but we can try pulling. -}
|
|
|
|
sync Nothing = do
|
|
|
|
diverged <- snd <$> manualPull Nothing gitremotes
|
|
|
|
return (True, diverged)
|
2012-08-22 18:32:17 +00:00
|
|
|
|
|
|
|
{- Updates the local sync branch, then pushes it to all remotes, in
|
2012-09-16 23:48:12 +00:00
|
|
|
- parallel, along with the git-annex branch. This is the same
|
|
|
|
- as "git annex sync", except in parallel, and will co-exist with use of
|
|
|
|
- "git annex sync".
|
2012-08-22 18:32:17 +00:00
|
|
|
-
|
2012-11-08 23:41:36 +00:00
|
|
|
- After the pushes to normal git remotes, also handles pushes over XMPP.
|
|
|
|
-
|
2012-08-22 18:32:17 +00:00
|
|
|
- Avoids running possibly long-duration commands in the Annex monad, so
|
2012-09-16 23:48:12 +00:00
|
|
|
- as not to block other threads.
|
|
|
|
-
|
|
|
|
- This can fail, when the remote's sync branch (or git-annex branch) has
|
|
|
|
- been updated by some other remote pushing into it, or by the remote
|
|
|
|
- itself. To handle failure, a manual pull and merge is done, and the push
|
|
|
|
- is retried.
|
|
|
|
-
|
|
|
|
- When there's a lot of activity, we may fail more than once.
|
|
|
|
- On the other hand, we may fail because the remote is not available.
|
|
|
|
- Rather than retrying indefinitely, after the first retry we enter a
|
|
|
|
- fallback mode, where our push is guarenteed to succeed if the remote is
|
|
|
|
- reachable. If the fallback fails, the push is queued to be retried
|
|
|
|
- later.
|
|
|
|
-
|
|
|
|
- The fallback mode pushes to branches on the remote that have our uuid in
|
|
|
|
- them. While ugly, those branches are reserved for pushing by us, and
|
|
|
|
- so our pushes will succeed.
|
|
|
|
-}
|
2012-10-29 20:22:14 +00:00
|
|
|
pushToRemotes :: UTCTime -> Bool -> [Remote] -> Assistant Bool
|
|
|
|
pushToRemotes now notifypushes remotes = do
|
|
|
|
(g, branch, u) <- liftAnnex $ do
|
2012-10-28 19:33:21 +00:00
|
|
|
Annex.Branch.commit "update"
|
|
|
|
(,,)
|
|
|
|
<$> gitRepo
|
|
|
|
<*> inRepo Git.Branch.current
|
|
|
|
<*> getUUID
|
2012-09-16 23:48:12 +00:00
|
|
|
go True branch g u remotes
|
2012-10-29 20:22:14 +00:00
|
|
|
where
|
|
|
|
go _ Nothing _ _ _ = return True -- no branch, so nothing to do
|
|
|
|
go shouldretry (Just branch) g u rs = do
|
|
|
|
debug ["pushing to", show rs]
|
|
|
|
liftIO $ Command.Sync.updateBranch (Command.Sync.syncBranch branch) g
|
|
|
|
(succeeded, failed) <- liftIO $ inParallel (push g branch) rs
|
|
|
|
updatemap succeeded []
|
|
|
|
if null failed
|
|
|
|
then do
|
|
|
|
when notifypushes $
|
2012-11-03 18:16:17 +00:00
|
|
|
sendNetMessage $ NotifyPush $
|
|
|
|
map Remote.uuid succeeded
|
2012-10-29 20:22:14 +00:00
|
|
|
return True
|
|
|
|
else if shouldretry
|
|
|
|
then retry branch g u failed
|
|
|
|
else fallback branch g u failed
|
2012-08-22 18:32:17 +00:00
|
|
|
|
2012-10-29 21:52:43 +00:00
|
|
|
updatemap succeeded failed = changeFailedPushMap $ \m ->
|
|
|
|
M.union (makemap failed) $
|
|
|
|
M.difference m (makemap succeeded)
|
2012-10-29 20:22:14 +00:00
|
|
|
makemap l = M.fromList $ zip l (repeat now)
|
2012-08-22 18:32:17 +00:00
|
|
|
|
2012-10-29 20:22:14 +00:00
|
|
|
retry branch g u rs = do
|
|
|
|
debug ["trying manual pull to resolve failed pushes"]
|
2012-10-29 20:28:45 +00:00
|
|
|
void $ manualPull (Just branch) rs
|
2012-10-29 20:22:14 +00:00
|
|
|
go False (Just branch) g u rs
|
2012-09-16 23:48:12 +00:00
|
|
|
|
2012-10-29 20:22:14 +00:00
|
|
|
fallback branch g u rs = do
|
|
|
|
debug ["fallback pushing to", show rs]
|
|
|
|
(succeeded, failed) <- liftIO $
|
|
|
|
inParallel (pushfallback g u branch) rs
|
|
|
|
updatemap succeeded failed
|
|
|
|
when (notifypushes && (not $ null succeeded)) $
|
2012-11-03 18:16:17 +00:00
|
|
|
sendNetMessage $ NotifyPush $
|
|
|
|
map Remote.uuid succeeded
|
2012-10-29 20:22:14 +00:00
|
|
|
return $ null failed
|
|
|
|
|
|
|
|
push g branch remote = Command.Sync.pushBranch remote branch g
|
|
|
|
pushfallback g u branch remote = Git.Command.runBool "push"
|
|
|
|
[ Param $ Remote.name remote
|
|
|
|
, Param $ refspec Annex.Branch.name
|
|
|
|
, Param $ refspec branch
|
|
|
|
] g
|
2012-10-31 06:34:03 +00:00
|
|
|
where
|
|
|
|
{- Push to refs/synced/uuid/branch; this
|
|
|
|
- avoids cluttering up the branch display. -}
|
|
|
|
refspec b = concat
|
|
|
|
[ s
|
|
|
|
, ":"
|
|
|
|
, "refs/synced/" ++ fromUUID u ++ "/" ++ s
|
|
|
|
]
|
|
|
|
where s = show $ Git.Ref.base b
|
2012-08-22 18:32:17 +00:00
|
|
|
|
|
|
|
{- Manually pull from remotes and merge their branches. -}
|
2012-10-29 20:28:45 +00:00
|
|
|
manualPull :: Maybe Git.Ref -> [Remote] -> Assistant ([Bool], Bool)
|
|
|
|
manualPull currentbranch remotes = do
|
|
|
|
g <- liftAnnex gitRepo
|
|
|
|
results <- liftIO $ forM remotes $ \r ->
|
2012-08-22 18:36:58 +00:00
|
|
|
Git.Command.runBool "fetch" [Param $ Remote.name r] g
|
2012-10-29 20:28:45 +00:00
|
|
|
haddiverged <- liftAnnex Annex.Branch.forceUpdate
|
2012-08-22 18:32:17 +00:00
|
|
|
forM_ remotes $ \r ->
|
2012-10-29 20:28:45 +00:00
|
|
|
liftAnnex $ Command.Sync.mergeRemote r currentbranch
|
2012-10-24 20:21:45 +00:00
|
|
|
return (results, haddiverged)
|
2012-09-11 01:55:59 +00:00
|
|
|
|
|
|
|
{- Start syncing a newly added remote, using a background thread. -}
|
2012-10-29 20:22:14 +00:00
|
|
|
syncNewRemote :: Remote -> Assistant ()
|
|
|
|
syncNewRemote remote = do
|
2012-10-30 19:39:15 +00:00
|
|
|
updateSyncRemotes
|
2012-10-30 23:12:05 +00:00
|
|
|
thread <- asIO $ do
|
|
|
|
reconnectRemotes False [remote]
|
|
|
|
void $ liftIO $ forkIO $ thread
|