sync, assistant, remotedaemon: Use ssh connection caching for git pushes and pulls.
For sync, saves 1 ssh connection per remote. For remotedaemon, the same ssh connection that is already open to run git-annex-shell notifychanges is reused to pull from the remote. Only potential problem is that this also enables connection caching when the assistant syncs with a ssh remote. Including the sync it does when a network connection has just come up. In that case, cached ssh connections are likely to be stale, and so using them would hang. Until I'm sure such problems have been dealt with, this commit needs to stay on the remotecontrol branch, and not be merged to master. This commit was sponsored by Alexandre Dupas.
This commit is contained in:
parent
96ce2812e0
commit
15917ec1a8
8 changed files with 121 additions and 38 deletions
|
@ -8,6 +8,7 @@
|
|||
module RemoteDaemon.Transport.Ssh (transport) where
|
||||
|
||||
import Common.Annex
|
||||
import Annex.Ssh
|
||||
import RemoteDaemon.Types
|
||||
import RemoteDaemon.Common
|
||||
import Remote.Helper.Ssh
|
||||
|
@ -22,7 +23,14 @@ import Control.Concurrent.Async
|
|||
import System.Process (std_in, std_out, std_err)
|
||||
|
||||
transport :: Transport
|
||||
transport r url transporthandle ichan ochan = do
|
||||
transport r url h@(TransportHandle g s) ichan ochan = do
|
||||
-- enable ssh connection caching wherever inLocalRepo is called
|
||||
g' <- liftAnnex h $ sshCachingTo r g
|
||||
transport' r url (TransportHandle g' s) ichan ochan
|
||||
|
||||
transport' :: Transport
|
||||
transport' r url transporthandle ichan ochan = do
|
||||
|
||||
v <- liftAnnex transporthandle $ git_annex_shell r "notifychanges" [] []
|
||||
case v of
|
||||
Nothing -> noop
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue