aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/layout/manager.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2024-02-15 13:58:15 +0100
committerAlex Auvolat <alex@adnab.me>2024-02-15 14:06:34 +0100
commiteb4a6ce1060a847be0b62c6a10ff3ba956e3f34d (patch)
tree84f6746ec92ca3a5344da22edadcd1ac3413aa29 /src/rpc/layout/manager.rs
parentcf2af186fcc0c8f581a966454b6cd4720d3821f0 (diff)
parent7be3f15e45fcfff10a45302a040c2919a3ba8ccd (diff)
downloadgarage-eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d.tar.gz
garage-eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d.zip
Merge branch 'main' into next-0.10
Diffstat (limited to 'src/rpc/layout/manager.rs')
-rw-r--r--src/rpc/layout/manager.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rpc/layout/manager.rs b/src/rpc/layout/manager.rs
index 6747b79d..0b6c7e63 100644
--- a/src/rpc/layout/manager.rs
+++ b/src/rpc/layout/manager.rs
@@ -4,9 +4,9 @@ use std::time::Duration;
use tokio::sync::Notify;
-use netapp::endpoint::Endpoint;
-use netapp::peering::fullmesh::FullMeshPeeringStrategy;
-use netapp::NodeID;
+use garage_net::endpoint::Endpoint;
+use garage_net::peering::PeeringManager;
+use garage_net::NodeID;
use garage_util::config::Config;
use garage_util::data::*;
@@ -37,7 +37,7 @@ impl LayoutManager {
config: &Config,
node_id: NodeID,
system_endpoint: Arc<Endpoint<SystemRpc, System>>,
- fullmesh: Arc<FullMeshPeeringStrategy>,
+ peering: Arc<PeeringManager>,
replication_mode: ReplicationMode,
) -> Result<Arc<Self>, Error> {
let replication_factor = replication_mode.replication_factor();
@@ -74,7 +74,7 @@ impl LayoutManager {
let rpc_helper = RpcHelper::new(
node_id.into(),
- fullmesh,
+ peering,
layout.clone(),
config.rpc_timeout_msec.map(Duration::from_millis),
);