mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

distributed cluster cycle prevention

Browse source 
Added BYPASS to P2P protocol, and use it to avoid cycling between
cluster gateways.

Distributed clusters are working well now!
This commit is contained in:
Joey Hess 2024-06-27 12:20:22 -04:00
parent effaf51b1f
commit 3dad9446ce
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
8 changed files with 156 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Command/P2PStdIO.hs
View file

@ -67,7 +67,7 @@ performProxy clientuuid servermode remote = do
p2pErrHandler
where
withclientversion clientside (Just (clientmaxversion, othermsg)) = do
remoteside <- proxySshRemoteSide clientmaxversion remote
remoteside <- proxySshRemoteSide clientmaxversion mempty remote
protocolversion <- either (const (min P2P.maxProtocolVersion clientmaxversion)) id
<$> runRemoteSide remoteside
(P2P.net P2P.getProtocolVersion)
@ -75,11 +75,14 @@ performProxy clientuuid servermode remote = do
closeRemoteSide remoteside
p2pDone
concurrencyconfig <- noConcurrencyConfig
proxy closer proxymethods servermode clientside
let runproxy othermsg' = proxy closer proxymethods
servermode clientside
(Remote.uuid remote)
(singleProxySelector remoteside)
concurrencyconfig
protocolversion othermsg p2pErrHandler
protocolversion othermsg' p2pErrHandler
sendClientProtocolVersion clientside othermsg protocolversion
runproxy p2pErrHandler
withclientversion _ Nothing = p2pDone
proxymethods = ProxyMethods