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

clusters need enableInteractiveBranchAccess

Browse source 
As seen in commit 770aac97a7, a cluster
relies accurate location logs. If long-running processes are serving a
cluster, and one process puts a file, the other process needs to see
what nodes it was stored on when checking if the file is present.
This commit is contained in:
Joey Hess 2024-07-28 12:39:42 -04:00
parent bd3d327d8a
commit 6722a61a21
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Annex/Cluster.hs
View file

@ -18,6 +18,7 @@ import P2P.Protocol
import P2P.IO import P2P.IO
import Annex.Proxy import Annex.Proxy
import Annex.UUID import Annex.UUID
import Annex.BranchState
import Logs.Location import Logs.Location
import Logs.PreferredContent import Logs.PreferredContent
import Types.Command import Types.Command
@ -38,6 +39,7 @@ proxyCluster
-> (forall a. Annex () -> ((a -> CommandPerform) -> Annex (Either ProtoFailure a) -> CommandPerform)) -> (forall a. Annex () -> ((a -> CommandPerform) -> Annex (Either ProtoFailure a) -> CommandPerform))
-> CommandPerform -> CommandPerform
proxyCluster clusteruuid proxydone servermode clientside protoerrhandler = do proxyCluster clusteruuid proxydone servermode clientside protoerrhandler = do
enableInteractiveBranchAccess
getClientProtocolVersion (fromClusterUUID clusteruuid) clientside getClientProtocolVersion (fromClusterUUID clusteruuid) clientside
withclientversion (protoerrhandler noop) withclientversion (protoerrhandler noop)
where where

2
P2P/Http/State.hs
View file

@ -25,6 +25,7 @@ import Annex.UUID
import Types.NumCopies import Types.NumCopies
import Types.WorkerPool import Types.WorkerPool
import Annex.WorkerPool import Annex.WorkerPool
import Annex.BranchState
import Types.Cluster import Types.Cluster
import CmdLine.Action (startConcurrency) import CmdLine.Action (startConcurrency)
import Utility.ThreadScheduler import Utility.ThreadScheduler
@ -185,6 +186,7 @@ withP2PConnections
-> (AcquireP2PConnection -> Annex a) -> (AcquireP2PConnection -> Annex a)
-> Annex a -> Annex a
withP2PConnections workerpool proxyconnectionpoolsize clusterconcurrency a = do withP2PConnections workerpool proxyconnectionpoolsize clusterconcurrency a = do
enableInteractiveBranchAccess
myuuid <- getUUID myuuid <- getUUID
reqv <- liftIO newEmptyTMVarIO reqv <- liftIO newEmptyTMVarIO
relv <- liftIO newEmptyTMVarIO relv <- liftIO newEmptyTMVarIO