clusters need enableInteractiveBranchAccess

As seen in commit 770aac97a75f64b86d73240055acffe1a5ed9f1a, 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.

diff --git a/Annex/Cluster.hs b/Annex/Cluster.hs
index 2faa7c5056f1b9290789e0fdc33d990fb5492b88..f3283094d33dd7ce2e1abb293a1320c4c5f2cab0 100644 (file)
--- a/Annex/Cluster.hs
+++ b/Annex/Cluster.hs
@@ -18,6 +18,7 @@ import P2P.Protocol
 import P2P.IO
 import Annex.Proxy
 import Annex.UUID
+import Annex.BranchState
 import Logs.Location
 import Logs.PreferredContent
 import Types.Command
@@ -38,6 +39,7 @@ proxyCluster
        -> (forall a. Annex () -> ((a -> CommandPerform) -> Annex (Either ProtoFailure a) -> CommandPerform))
        -> CommandPerform
 proxyCluster clusteruuid proxydone servermode clientside protoerrhandler = do
+       enableInteractiveBranchAccess
        getClientProtocolVersion (fromClusterUUID clusteruuid) clientside
                withclientversion (protoerrhandler noop)
   where

diff --git a/P2P/Http/State.hs b/P2P/Http/State.hs
index 899584a52bfa5805e44d8eee18f2c835655faf47..6877cea7d3046e0a6e926a5ad6f079f5d7cad2b4 100644 (file)
--- a/P2P/Http/State.hs
+++ b/P2P/Http/State.hs
@@ -25,6 +25,7 @@ import Annex.UUID
 import Types.NumCopies
 import Types.WorkerPool
 import Annex.WorkerPool
+import Annex.BranchState
 import Types.Cluster
 import CmdLine.Action (startConcurrency)
 import Utility.ThreadScheduler
@@ -185,6 +186,7 @@ withP2PConnections
        -> (AcquireP2PConnection -> Annex a)
        -> Annex a
 withP2PConnections workerpool proxyconnectionpoolsize clusterconcurrency a = do
+       enableInteractiveBranchAccess
        myuuid <- getUUID
        reqv <- liftIO newEmptyTMVarIO
        relv <- liftIO newEmptyTMVarIO