mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/RemoteDaemon/Types.hs

117 lines
3.4 KiB
Haskell
Raw Normal View History

basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
{- git-remote-daemon data types.
-
- Copyright 2014 Joey Hess <joey@kitenet.net>
-
- Licensed under the GNU GPL version 3 or higher.
-}
{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
module RemoteDaemon.Types where
make git-remote-daemon ssh transport robust * Remote system might be available, and connection get lost. Should reconnect, but needs to avoid bad behavior (ie, constant reconnect attempts.) Use exponential backoff. * Detect if old system had a too old git-annex-shell, and show the user a nice message in the webapp. Required parsing error messages, so perhaps this code shoudl be removed once enough time has passed.. * Switch the protocol to using remote URI's, rather than remote names. Names change. Also avoids issues with serialization of names containing whitespace. This is nearly ready for merge into master now. I'd still like to make the ssh transport smarter about reusing ssh connection caching during git pull. This commit was sponsored by Jim Paris.
2014-04-09 18:10:29 +00:00
import Common
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
import qualified Annex
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
import qualified Git.Types as Git
import qualified Utility.SimpleProtocol as Proto
make git-remote-daemon ssh transport robust * Remote system might be available, and connection get lost. Should reconnect, but needs to avoid bad behavior (ie, constant reconnect attempts.) Use exponential backoff. * Detect if old system had a too old git-annex-shell, and show the user a nice message in the webapp. Required parsing error messages, so perhaps this code shoudl be removed once enough time has passed.. * Switch the protocol to using remote URI's, rather than remote names. Names change. Also avoids issues with serialization of names containing whitespace. This is nearly ready for merge into master now. I'd still like to make the ssh transport smarter about reusing ssh connection caching during git pull. This commit was sponsored by Jim Paris.
2014-04-09 18:10:29 +00:00
import Network.URI
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
import Control.Concurrent
remotedaemon: Fix problem that could prevent ssh connections being made after two LOSTNET messages were received in a row Perhaps due to two different network interfaces being brought down. Since there is no reliable way to drain a Chan, I switched to STM TChan.
2015-01-15 19:37:48 +00:00
import Control.Concurrent.STM
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
make git-remote-daemon ssh transport robust * Remote system might be available, and connection get lost. Should reconnect, but needs to avoid bad behavior (ie, constant reconnect attempts.) Use exponential backoff. * Detect if old system had a too old git-annex-shell, and show the user a nice message in the webapp. Required parsing error messages, so perhaps this code shoudl be removed once enough time has passed.. * Switch the protocol to using remote URI's, rather than remote names. Names change. Also avoids issues with serialization of names containing whitespace. This is nearly ready for merge into master now. I'd still like to make the ssh transport smarter about reusing ssh connection caching during git pull. This commit was sponsored by Jim Paris.
2014-04-09 18:10:29 +00:00
-- The URI of a remote is used to uniquely identify it (names change..)
newtype RemoteURI = RemoteURI URI
indent with tabs not spaces Found these with: git grep "^ " $(find -type f -name \*.hs) |grep -v ': where' Unfortunately there is some inline hamlet that cannot use tabs for indentation. Also, Assistant/WebApp/Bootstrap3.hs is a copy of a module and so I'm leaving it as-is.
2014-10-09 19:09:26 +00:00
deriving (Show)
make git-remote-daemon ssh transport robust * Remote system might be available, and connection get lost. Should reconnect, but needs to avoid bad behavior (ie, constant reconnect attempts.) Use exponential backoff. * Detect if old system had a too old git-annex-shell, and show the user a nice message in the webapp. Required parsing error messages, so perhaps this code shoudl be removed once enough time has passed.. * Switch the protocol to using remote URI's, rather than remote names. Names change. Also avoids issues with serialization of names containing whitespace. This is nearly ready for merge into master now. I'd still like to make the ssh transport smarter about reusing ssh connection caching during git pull. This commit was sponsored by Jim Paris.
2014-04-09 18:10:29 +00:00
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
-- A Transport for a particular git remote consumes some messages
-- from a Chan, and emits others to another Chan.
remotedaemon: Fix problem that could prevent ssh connections being made after two LOSTNET messages were received in a row Perhaps due to two different network interfaces being brought down. Since there is no reliable way to drain a Chan, I switched to STM TChan.
2015-01-15 19:37:48 +00:00
type Transport = RemoteRepo -> RemoteURI -> TransportHandle -> TChan Consumed -> TChan Emitted -> IO ()
cleaned up AnnexState handling in transports
2014-04-08 17:41:36 +00:00
type RemoteRepo = Git.Repo
type LocalRepo = Git.Repo
-- All Transports share a single AnnexState MVar
fix RELOAD
2014-04-20 19:45:14 +00:00
--
-- Different TransportHandles may have different versions of the LocalRepo.
-- (For example, the ssh transport modifies it to enable ssh connection
-- caching.)
cleaned up AnnexState handling in transports
2014-04-08 17:41:36 +00:00
data TransportHandle = TransportHandle LocalRepo (MVar Annex.AnnexState)
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
-- Messages that the daemon emits.
data Emitted
make git-remote-daemon ssh transport robust * Remote system might be available, and connection get lost. Should reconnect, but needs to avoid bad behavior (ie, constant reconnect attempts.) Use exponential backoff. * Detect if old system had a too old git-annex-shell, and show the user a nice message in the webapp. Required parsing error messages, so perhaps this code shoudl be removed once enough time has passed.. * Switch the protocol to using remote URI's, rather than remote names. Names change. Also avoids issues with serialization of names containing whitespace. This is nearly ready for merge into master now. I'd still like to make the ssh transport smarter about reusing ssh connection caching during git pull. This commit was sponsored by Jim Paris.
2014-04-09 18:10:29 +00:00
= CONNECTED RemoteURI
| DISCONNECTED RemoteURI
| SYNCING RemoteURI
| DONESYNCING RemoteURI Bool
| WARNING RemoteURI String
send remote-daemon a RELOAD after making a ssh remote This doesn't work yet, because RELOAD is buggy and does not notice the new remote.
2014-04-20 19:30:39 +00:00
deriving (Show)
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
-- Messages that the deamon consumes.
data Consumed
= PAUSE
remotedaemon: When network connection is lost, close all cached ssh connections. This commit was sponsored by Cedric Staub.
2014-04-12 20:32:59 +00:00
| LOSTNET
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
| RESUME
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
| CHANGED RefList
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
| RELOAD
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
| STOP
send remote-daemon a RELOAD after making a ssh remote This doesn't work yet, because RELOAD is buggy and does not notice the new remote.
2014-04-20 19:30:39 +00:00
deriving (Show)
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
type RefList = [Git.Ref]
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
instance Proto.Sendable Emitted where
git-annex-shell: Added notifychanges command. This will be used by the remote-daemon to quickly tell when changes have been pushed from some other repository into a ssh remote. Adjusted the remote-daemon protocol to communicate changed shas, rather than git branch refs. This way, it can easily check if a sha is new. This commit was sponsored by Carlos Trijueque Albarran.
2014-04-05 20:04:37 +00:00
formatMessage (CONNECTED remote) =
["CONNECTED", Proto.serialize remote]
formatMessage (DISCONNECTED remote) =
["DISCONNECTED", Proto.serialize remote]
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
formatMessage (SYNCING remote) =
["SYNCING", Proto.serialize remote]
make git-remote-daemon ssh transport robust * Remote system might be available, and connection get lost. Should reconnect, but needs to avoid bad behavior (ie, constant reconnect attempts.) Use exponential backoff. * Detect if old system had a too old git-annex-shell, and show the user a nice message in the webapp. Required parsing error messages, so perhaps this code shoudl be removed once enough time has passed.. * Switch the protocol to using remote URI's, rather than remote names. Names change. Also avoids issues with serialization of names containing whitespace. This is nearly ready for merge into master now. I'd still like to make the ssh transport smarter about reusing ssh connection caching during git pull. This commit was sponsored by Jim Paris.
2014-04-09 18:10:29 +00:00
formatMessage (DONESYNCING remote status) =
["DONESYNCING", Proto.serialize remote, Proto.serialize status]
formatMessage (WARNING remote message) =
["WARNING", Proto.serialize remote, Proto.serialize message]
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
instance Proto.Sendable Consumed where
formatMessage PAUSE = ["PAUSE"]
remotedaemon: When network connection is lost, close all cached ssh connections. This commit was sponsored by Cedric Staub.
2014-04-12 20:32:59 +00:00
formatMessage LOSTNET = ["LOSTNET"]
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
formatMessage RESUME = ["RESUME"]
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
formatMessage (CHANGED refs) =["CHANGED", Proto.serialize refs]
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
formatMessage RELOAD = ["RELOAD"]
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
formatMessage STOP = ["STOP"]
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
instance Proto.Receivable Emitted where
git-annex-shell: Added notifychanges command. This will be used by the remote-daemon to quickly tell when changes have been pushed from some other repository into a ssh remote. Adjusted the remote-daemon protocol to communicate changed shas, rather than git branch refs. This way, it can easily check if a sha is new. This commit was sponsored by Carlos Trijueque Albarran.
2014-04-05 20:04:37 +00:00
parseCommand "CONNECTED" = Proto.parse1 CONNECTED
parseCommand "DISCONNECTED" = Proto.parse1 DISCONNECTED
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
parseCommand "SYNCING" = Proto.parse1 SYNCING
parseCommand "DONESYNCING" = Proto.parse2 DONESYNCING
make git-remote-daemon ssh transport robust * Remote system might be available, and connection get lost. Should reconnect, but needs to avoid bad behavior (ie, constant reconnect attempts.) Use exponential backoff. * Detect if old system had a too old git-annex-shell, and show the user a nice message in the webapp. Required parsing error messages, so perhaps this code shoudl be removed once enough time has passed.. * Switch the protocol to using remote URI's, rather than remote names. Names change. Also avoids issues with serialization of names containing whitespace. This is nearly ready for merge into master now. I'd still like to make the ssh transport smarter about reusing ssh connection caching during git pull. This commit was sponsored by Jim Paris.
2014-04-09 18:10:29 +00:00
parseCommand "WARNING" = Proto.parse2 WARNING
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
parseCommand _ = Proto.parseFail
instance Proto.Receivable Consumed where
parseCommand "PAUSE" = Proto.parse0 PAUSE
remotedaemon: When network connection is lost, close all cached ssh connections. This commit was sponsored by Cedric Staub.
2014-04-12 20:32:59 +00:00
parseCommand "LOSTNET" = Proto.parse0 LOSTNET
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
parseCommand "RESUME" = Proto.parse0 RESUME
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
parseCommand "CHANGED" = Proto.parse1 CHANGED
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
parseCommand "RELOAD" = Proto.parse0 RELOAD
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
parseCommand "STOP" = Proto.parse0 STOP
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
parseCommand _ = Proto.parseFail
make git-remote-daemon ssh transport robust * Remote system might be available, and connection get lost. Should reconnect, but needs to avoid bad behavior (ie, constant reconnect attempts.) Use exponential backoff. * Detect if old system had a too old git-annex-shell, and show the user a nice message in the webapp. Required parsing error messages, so perhaps this code shoudl be removed once enough time has passed.. * Switch the protocol to using remote URI's, rather than remote names. Names change. Also avoids issues with serialization of names containing whitespace. This is nearly ready for merge into master now. I'd still like to make the ssh transport smarter about reusing ssh connection caching during git pull. This commit was sponsored by Jim Paris.
2014-04-09 18:10:29 +00:00
instance Proto.Serializable RemoteURI where
serialize (RemoteURI u) = show u
deserialize = RemoteURI <$$> parseURI
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
instance Proto.Serializable [Char] where
serialize = id
deserialize = Just
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
instance Proto.Serializable RefList where
basic support for git-remote-daemon protocol
2014-04-05 18:30:42 +00:00
serialize = unwords . map Git.fromRef
deserialize = Just . map Git.Ref . words
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
instance Proto.Serializable Bool where
serialize False = "0"
serialize True = "1"
deserialize "0" = Just False
deserialize "1" = Just True
deserialize _ = Nothing
Reference in a new issue Copy permalink